fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4478 commits 91 branches 177 tags 18 MiB
Commit graph

402 commits

Author SHA1 Message Date
Nico Schottelius
0a98abbffa add messaging support for __key_value 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-11 15:39:08 +01:00
og
3d5706d3cc escaped some variables in the gencode-remote output 2014-03-08 17:18:19 -07:00
og
074938c697 . 2014-03-03 15:13:57 -07:00
og
3fffb93150 OpenBSD pkg utils does not return properly, so we have to verify success by looking at the list of installed packages after the present/absent actions 2014-03-03 14:59:50 -07:00
Nico Schottelius
f06ff4bc3a Merge branch 'master' of https://github.com/ghettosh/cdist 2014-03-03 07:40:54 +01:00
og
ef1f9bf633 updated documentation to reflect new parameter 2014-03-02 17:44:22 -07:00
og
6a455be63a openbsd and freebsd both use the 'passwd' database 2014-03-02 17:34:36 -07:00
og
5cbdf981c0 adding pkg_path parameter to be explicitly set, this is important for using -current, as os_version always parses to a release version (e.g. 5.5) but the path that mirrors have is /snapshots/ 2014-03-02 17:32:14 -07:00
og
1c0d74f7db openbsd stat works the same way that freebsd's does 2014-03-02 17:18:25 -07:00
Daniel Heule
fa55cd7d3b ups, typo ... thx to steven 2014-02-27 21:08:45 +01:00
Daniel Heule
727c918f67 work around a bug in bash3, now tested with dash, bash, busybox 2014-02-27 17:04:23 +01:00
Daniel Heule
0198b99eb5 corrected some debug codesnips 2014-02-27 15:47:19 +01:00
Daniel Heule
8d80e52de9 implemented some suggestions from steven 2014-02-27 14:45:19 +01:00
Daniel Heule
d1c55a9acb Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value 2014-02-25 11:41:18 +01:00
Daniel Heule
225752bd42 updated the man page .... 2014-02-25 11:35:14 +01:00
Nico Schottelius
8e68da055c Merge branch 'docfix-ssh-22' of https://github.com/acatton/cdist 2014-02-25 09:51:43 +01:00
Daniel Heule
820ed5ae0c added option comment_line to prefix key value with a comment line 2014-02-24 23:27:42 +01:00
Daniel Heule
205e256ef6 rewrite of __key_value, now support nerarly every value 2014-02-24 21:42:45 +01:00
Nico Schottelius
a126bd955f use while read -> avoids ifs problem 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-24 18:06:15 +01:00
Nico Schottelius
ce0f779664 include the owner into the object_id for line 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-24 16:00:12 +01:00
Antoine Catton
4e535b6b8b Docfix: ssh service listen on port 22 2014-02-23 20:22:06 -07:00
Steven Armstrong
95f38d9d44 remove no longer supported parameter --comment 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-22 01:12:41 +01:00
Steven Armstrong
16a829d3eb manage individual keys instead of block of text 
also fixes #251

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-22 01:10:44 +01:00
Steven Armstrong
2fdff153d6 dont fail if result is empty file 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-22 00:57:00 +01:00
Steven Armstrong
68c1bf6633 preserve ownership and permissions of existing file 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-22 00:56:54 +01:00
Nico Schottelius
13e8e53941 Merge branch 'master' into type__rbenv 2014-02-14 20:51:29 +01:00
Nico Schottelius
f461a5073c pass owner/group/mode to __directory as well 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 20:44:51 +01:00
Nico Schottelius
95b1ac0706 update rbenv type to cdist 3.0 style 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 20:34:24 +01:00
Nico Schottelius
490bad7b26 Merge branch 'master' into type__rbenv 2014-02-14 20:13:18 +01:00
Daniel Heule
e8f5d4c340 some new explorers wich are handy if you must tune for example sap or 
oracle to the systemtype, cpu cores and/or physical memory
 2014-02-13 15:38:35 +01:00
Nico Schottelius
a2c2cc139a adjust default branch hint 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-13 10:33:24 +01:00
Nico Schottelius
2ceced593b Merge branch 'bugfix_state_params' of git://github.com/dheule/cdist 2014-02-12 17:04:30 +01:00
Nico Schottelius
23f85118f5 add a hint about unsupported os 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 16:42:02 +01:00
Daniel Heule
f3172fda95 2 more types for issue 131 2014-02-08 22:06:27 +01:00
Daniel Heule
423001b702 Make state parameter optional for all types, fixes #131 2014-02-08 21:48:51 +01:00
Nico Schottelius
4264237bfe Merge branch 'bugfix__types_default_values' of git://github.com/dheule/cdist 2014-02-06 11:26:35 +01:00
Nico Schottelius
294285c164 import __ccollect_source type 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 00:08:40 +01:00
Nico Schottelius
8afb752908 Merge branch 'issue/283' of git://github.com/asteven/cdist 2014-02-05 23:13:59 +01:00
Steven Armstrong
6f0459f3c5 remove legacy FIXME 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:18:47 +01:00
Steven Armstrong
7686a5ac5e be nice to them users 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:17:15 +01:00
Steven Armstrong
14a112fcce /wget/curl/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:12:22 +01:00
Steven Armstrong
f928072f74 let the user decide what is sane and what not 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:07:33 +01:00
Steven Armstrong
03ce5a2828 import __apt_* types from private repo 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-04 12:24:10 +01:00
Daniel Heule
3c52710763 little changes for using default parameters correctly 2014-02-03 21:43:39 +01:00
Steven Armstrong
3a57367e7e bugfix: make type actually work with --state absent 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-01 22:46:36 +01:00
Nico Schottelius
228ed4dbd2 fix typos in __debconf_set_selections 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-29 23:19:07 +01:00
Nico Schottelius
c3508945ca Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-01-27 19:37:23 +01:00
Jake Guffey
723be34bca Fixed typo 
Was assigning jaildir=$object/parameter/name, fixed to $object/parameter/jaildir
 2014-01-27 13:22:03 -05:00
Nico Schottelius
9049a1421c support --file - in __debconf_set_selections 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-27 14:17:51 +01:00
Nico Schottelius
d0ef6b6583 Merge branch 'issue/271' of git://github.com/asteven/cdist 2014-01-22 22:05:55 +01:00
Steven Armstrong
7a0b3cd7b7 python-software-properties still needed for older ubuntu versions 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-22 21:21:34 +01:00
Daniel Heule
b75481a4d4 parameter default handling in __key_value type corrected 2014-01-21 23:18:10 +01:00
Daniel Heule
360b42e892 parameter default handling in __zypper_repo type corrected 2014-01-21 22:57:06 +01:00
Daniel Heule
08b8270739 parameter default handling in __zypper_service type corrected 2014-01-21 22:45:35 +01:00
Daniel Heule
02c3fe4988 parameter default handling in __qemu_img type corrected 2014-01-21 22:33:10 +01:00
Daniel Heule
92e67182a6 parameter default handling in __cdist type corrected 2014-01-21 22:24:35 +01:00
Nico Schottelius
51c9662475 DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A B-A-C-K-S-L-A-S-H 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-21 16:41:34 +01:00
Nico Schottelius
b6bae508a8 use hostnamectl, if available, else use /etc/hostname and hostname 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 14:26:22 +01:00
Nico Schottelius
8d5357107b use uname -n in hostname explorer 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 14:07:31 +01:00
Steven Armstrong
aee97cffd6 install proper packages 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-20 14:01:29 +01:00
Nico Schottelius
cd6abf379a allow hostname -f to fail and return empty output 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 13:52:49 +01:00
Nico Schottelius
9123940255 port selection of first part into gencode-remote 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 13:51:48 +01:00
Nico Schottelius
29d4f910bc do not change parameters 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 13:50:42 +01:00
Nico Schottelius
5279b7239c import __hostname - Thanks, Steven! 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 13:47:45 +01:00
Nico Schottelius
b0ebc277d6 Merge branch 'issue/260' of git://github.com/asteven/cdist 2014-01-18 15:57:02 +01:00
Nico Schottelius
63af60a0d9 Merge branch 'issue/261' of git://github.com/asteven/cdist 2014-01-18 15:54:38 +01:00
Daniel Heule
4e94713f07 documented all messages which I have found via grep 2014-01-17 10:27:21 +01:00
Steven Armstrong
36a330eb3c redirect stderr to /dev/null 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-16 12:00:24 +01:00
Steven Armstrong
0b7d9babf6 whitespace-- 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-16 11:11:00 +01:00
Steven Armstrong
3b072a7abb use __block type to manage keys 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-16 11:10:14 +01:00
Steven Armstrong
095c5335c6 use default parameters 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-16 11:05:29 +01:00
Nico Schottelius
2c30704ba7 add hints about ignored parameters 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-15 13:28:41 +01:00
Nico Schottelius
f336bcb6fc Merge branch 'feature/__mount' of git://github.com/asteven/cdist 2014-01-15 13:24:31 +01:00
Steven Armstrong
a787d2b27b new type to manage a block of text in a file 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-14 21:43:50 +01:00
Steven Armstrong
33c8f83fa6 new type to manage mounts, either via fstab or manually 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-14 21:39:24 +01:00
Daniel Heule
5a114cf6ae __cron should replace entrys with his id, try 2 2014-01-14 10:11:33 +01:00
Daniel Heule
6afc4b82c2 __cron should replace entrys with his id 2014-01-14 09:47:54 +01:00
Daniel Heule
613d66b7a7 corrected man page and gencode update for correct messages 2014-01-09 16:09:49 +01:00
Nico Schottelius
fccdcd768d Merge branch 'bugfix__directory' of https://github.com/dheule/cdist 2014-01-08 14:50:09 +01:00
Daniel Heule
afb06b729e mode and message handling now like __file type 2014-01-08 13:10:46 +01:00
Nico Schottelius
3f08565e59 Revert "install rubygems for ubuntu/debian" 
On request by Steven.

This reverts commit d2c45717f1.
 2014-01-08 11:09:01 +01:00
Daniel Heule
3e398b233b fix compare with leading 0 on directory mode 2014-01-08 09:48:04 +01:00
Nico Schottelius
f8c36c080e do not escape \ in --line 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-07 22:30:59 +01:00
Nico Schottelius
386a84eafc Merge branch 'bugfix__start_on_boot' of https://github.com/dheule/cdist 2014-01-07 17:47:15 +01:00
Daniel Heule
f5cee7a57d suses chkconfig has the same name, but works different 2014-01-07 17:31:45 +01:00
Steven Armstrong
d2c45717f1 install rubygems for ubuntu/debian 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-07 16:31:32 +01:00
Daniel Heule
dc8e9c6855 fix typo on optional parameter which is only a passthrough to 
__package_zypper
 2014-01-07 13:23:39 +01:00
Nico Schottelius
ee25229a48 Merge remote-tracking branch 'dheule/bugfix_zypper_types_on_older_suse_relases' 2013-12-20 08:55:42 +01:00
Nico Schottelius
d288acbe30 Merge remote-tracking branch 'steven/issue/236' 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__user/gencode-remote
 2013-12-20 08:53:01 +01:00
Nico Schottelius
7fad1074b6 Merge remote-tracking branch 'dheule/type__user' 2013-12-20 08:45:37 +01:00
Nico Schottelius
1d0233fe4e Merge branch 'type__cron' of https://github.com/dheule/cdist 2013-12-19 15:00:16 +01:00
Daniel Heule
c50925cab5 bugfix in __cron type, was a wrong quoting 2013-12-19 14:45:55 +01:00
Daniel Heule
d6f84d1ef0 __start_on_boot incl. gentoo support 2013-12-19 13:54:16 +01:00
Steven Armstrong
80fffbad11 implement messaging for __user type 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-19 11:21:44 +01:00
Steven Armstrong
9d54eb7257 implement messaging for __group type 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-19 11:21:26 +01:00
Daniel Heule
e5253e0330 correct man page text of system parameter 2013-12-19 08:14:29 +01:00
Nico Schottelius
122fb96654 use default parameter for __start_on_boot type 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-18 18:09:57 +01:00
Daniel Heule
7d4c11a186 reset false mode changes 2013-12-17 14:15:41 +01:00
Daniel Heule
138d26e398 extended type __user: parameter state, system, remove-home new 2013-12-17 14:13:20 +01:00
Daniel Heule
a70d478f9e fixed a minor type with param remove-all-other-services 2013-12-16 17:07:49 +01:00
Daniel Heule
aec1632627 on older systems, zypper service and zypper repos 
doesn't know the parameter -E,
so we need a way which works on older releases too
 2013-12-16 16:19:27 +01:00
Steven Armstrong
14dee79a9b handle parameter --state explicilty to respect defaults 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-16 13:29:43 +01:00
Nico Schottelius
8854bc55d9 Merge branch 'type__package_emerge_dependencies' of https://github.com/dheule/cdist 2013-12-13 14:31:28 +01:00
Nico Schottelius
bdb4ffb449 Merge branch 'type__package_emerge' of https://github.com/dheule/cdist 2013-12-13 14:30:20 +01:00
Nico Schottelius
8e1cf76cd5 Merge branch 'type__package_zypper' of https://github.com/dheule/cdist 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__package_zypper/man.text
 2013-12-13 09:00:09 +01:00
Daniel Heule
c48f31389f initial submit of type __package_emerge_dependencies 2013-12-12 10:59:45 +01:00
Daniel Heule
fc8543eab6 initial submit of __package_emerge type 2013-12-12 10:56:15 +01:00
Daniel Heule
b12bd82fe2 corrected some minor spell misstakes 2013-12-12 09:29:22 +01:00
Daniel Heule
aaa142d76b __package_zypper can now handle the version parameter 2013-12-11 17:11:22 +01:00
Nico Schottelius
4bb8dc2f53 2012 -> 2013 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-11 14:43:35 +01:00
Nico Schottelius
f955191d77 Merge remote-tracking branch 'dheule/type__package_zypper' 2013-12-11 14:39:32 +01:00
Daniel Heule
785e54b311 vorbereitung um mit zypper auch spezifische versionen zu unterstützen 
parameter ptype auch beim package type zulassen, analog anderer
parameter von subtypes ...
 2013-12-11 13:44:01 +01:00
Daniel Heule
01dc23b00c postfix install works also on suse (SLES11) 2013-12-11 13:07:40 +01:00
Daniel Heule
0acf3c0118 type __postfix_postconf is tested and aproved to work on suse (SLES11) 2013-12-10 17:25:03 +01:00
Daniel Heule
e1eae5604e unlock the whole power of zypper 
added the ptype parameter (package type of zypper install)
 2013-12-10 16:57:02 +01:00
Nico Schottelius
ae438b9719 Merge pull request #220 from dheule/type__zypper_service 
new type  __zypper_service
 2013-12-10 06:43:38 -08:00
Daniel Heule
f7f63aa7a2 remove SFS from man page text ... 2013-12-10 11:54:42 +01:00
Daniel Heule
0f1dabb080 inital commit of __zypper_service 2013-12-10 11:50:18 +01:00
Steven Armstrong
d068dfd621 escape and thereby preserve quotes in values 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-10 11:02:10 +01:00
Daniel Heule
e6420a49e8 verhindern dass raw and raw_command zusammen angegeben werden 2013-12-09 11:39:44 +01:00
Daniel Heule
02aad6f4cc revert vom chmod der aus versehen geändert wurde ... 2013-12-09 09:57:31 +01:00
Daniel Heule
c0da6fcc89 Verbesserungen am __cron type 
1. Filter messages from crontab -l welche das ganze file füllen
2. neuer parameter raw_command, um globale variablen zu setzen ...
 2013-12-09 09:44:40 +01:00
Nico Schottelius
fe20da6594 note hint from Axel Beckert for debian prios 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-07 00:13:28 +01:00
Nico Schottelius
a89926c40b Merge branch 'dheule/type__zypper_repo' 2013-12-06 23:53:46 +01:00
Daniel Heule
a271244cfb Die 4 codepaths mit comments erklaert ... 2013-12-06 15:23:09 +01:00
Steven Armstrong
367ef21bd8 make __postfix_* types depend on __postfix 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-06 13:49:45 +01:00
Daniel Heule
59de2afdaa ups, was a variable collision 2013-12-05 13:14:15 +01:00
Daniel Heule
512b410012 korrektur eines typos ... 2013-12-05 08:47:57 +01:00
Daniel Heule
e1a2ebab5c gencode-remote gibt nur noch befehle aus wenn was zu tun ist ... 2013-12-05 08:45:12 +01:00
Daniel Heule
72bbf93282 korrekte ids, hier werden von zypper keine quotes erwartet, da nur 
zahlen moeglich sind
 2013-12-04 15:32:31 +01:00
Daniel Heule
a37c48ed43 bei dem repo_id eine kleine verschoenerung 2013-12-04 15:24:18 +01:00
Daniel Heule
33a4f07bb4 in der manpage state parameter besser erlaeutert ... 
TODO: howto line breaks in html ?
 2013-12-04 15:22:48 +01:00
Daniel Heule
ea33b093f0 cleanup of variable quoting 2013-12-04 14:58:15 +01:00
Daniel Heule
808ea30634 Korrektur der intention, vim hat mich verschaukelt ... 2013-12-04 14:50:11 +01:00
Nico Schottelius
acd42b259b do not generate code when mode = 0xxx format 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-04 13:37:15 +01:00
Nico Schottelius
ed10f4e5b4 use default parameter 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-04 13:19:25 +01:00
Nico Schottelius
b9dcd01ea1 only restart the firewall (iptables) if needed 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-04 13:19:04 +01:00
Daniel Heule
6a68c14a76 letzter feinschliff bei der man page ... 2013-12-04 10:56:45 +01:00
Daniel Heule
19219fe1f9 An allen orten correcte gpl headers eingesetzt ... 2013-12-04 09:44:45 +01:00
Daniel Heule
b29a52db1a Initial add vom type __zypper_repo 2013-12-04 09:37:01 +01:00
Nico Schottelius
68b7392021 add support for messaging to __file, document messaging in reference 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-03 15:41:43 +01:00
Nico Schottelius
684ad56a80 Merge branch 'master' into notifications 
Took the __file parts from master.

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__file/gencode-local
	cdist/conf/type/__file/gencode-remote
 2013-12-03 14:38:11 +01:00
Nico Schottelius
a95167b374 remove quotes from mkdiropt 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-02 15:49:02 +01:00
Daniel Heule
d074713b94 Fix explorer and globalopts issue in type __package_zypper 
Fixes #215.

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-02 13:27:42 +01:00
Nico Schottelius
48923d23d8 if ... THEN ;-) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-12-01 18:37:08 +01:00
Nico Schottelius
f47d2c22bc Merge remote-tracking branch 'steven/issue/202' 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__link/explorer/type
 2013-11-27 16:24:20 +01:00
Nico Schottelius
dfe4274467 Merge remote-tracking branch 'steven/issue/201' 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__directory/explorer/stat
	cdist/conf/type/__directory/explorer/type
 2013-11-27 16:23:16 +01:00
Nico Schottelius
08dbf2e96c Merge remote-tracking branch 'steven/issue/198' 2013-11-27 16:22:14 +01:00
Steven Armstrong
abf291cb20 add gpl header 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-11-27 16:09:02 +01:00
Steven Armstrong
71b41df733 no late delete 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-11-27 16:09:02 +01:00