thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity
4838 commits 109 branches 178 tags 19 MiB
Commit graph

844 commits

Author SHA1 Message Date
Darko Poljak
5e5106479f Fix old bug: join wrong arg for OSError. 2016-03-18 18:22:14 +01:00
Darko Poljak
6ae94df0a1 Reset manually to original. 
Limited connectivity, but have extra time, so doing it online. Will be fixed in a separate branch.
 2016-03-18 12:29:16 +01:00
Darko Poljak
3ae042f2cd Rverting manually (limited connectivity) to original. 
Will be fixed in a separate branch.
 2016-03-18 12:27:23 +01:00
Darko Poljak
e937a939ad Merge pull request #1 from ungleich/master 
update from original
 2016-03-18 12:20:19 +01:00
Steven Armstrong
32557cfa2c Merge remote-tracking branch 'ungleich/master' 2016-03-17 23:42:59 +01:00
Steven Armstrong
afbb3df280 remove legacy cruft 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-03-17 23:35:59 +01:00
Darko Poljak
8ed0c672b1 Fix error with args. 2016-03-11 19:23:59 +01:00
Darko Poljak
2dfc30e3c4 Revert "Add ssh multiplexing options to default REMOTE_EXEC and REMOTE_COPY." 
This reverts commit bb43a8f47f.
 2016-03-10 20:01:08 +01:00
Darko Poljak
bb43a8f47f Add ssh multiplexing options to default REMOTE_EXEC and REMOTE_COPY. 2016-03-06 08:20:16 +01:00
Nico Schottelius
36d6ffbe74 Merge branch 'master' of github.com:telmich/cdist 2016-02-25 07:19:45 +01:00
Nico Schottelius
f6678b931f Remove zip package from __consul as it is required on the management host only 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-02-25 07:18:19 +01:00
Nico Schottelius
bf4ece76fd update __consul with new URLs and new versions 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-02-25 07:17:27 +01:00
Stephan Leemburg
b03a4f2829 Added Mitel as a redhat derived OS 2016-02-23 12:57:21 +01:00
Stephan Leemburg
37fec8b3b5 Added Mitel as a redhat derived OS 2016-02-23 11:54:08 +01:00
Steven Armstrong
f0e07903b6 fix download url for consul 0.5.2 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-02-20 12:48:29 +01:00
Steven Armstrong
483ee91b12 Merge remote-tracking branch 'telmich/master' 2016-02-20 12:47:03 +01:00
Christian Kruse
d1d065a3e1 fix: don't overwrite ownergroup but append 2016-02-18 11:02:32 +01:00
Steven Armstrong
7997551b48 Merge remote-tracking branch 'telmich/master' 2015-10-27 15:55:25 +01:00
Nico Schottelius
b9280f1ea7 Merge pull request #407 from jakllsch/netbsd-group 
don't use the non-existant gshadow database on NetBSD either
 2015-10-20 15:36:16 +02:00
Nico Schottelius
46ef188079 Merge pull request #405 from jakllsch/netbsd-explorer-stat 
Treat NetBSD the same as FreeBSD and OpenBSD in 'stat' explorers
 2015-10-20 15:31:55 +02:00
Nico Schottelius
6a15f306e4 Merge pull request #404 from jakllsch/netbsd-timezone 
support NetBSD in __timezone type
 2015-10-20 15:29:18 +02:00
Jonathan A. Kollasch
90fe1bf6c9 add some NetBSD support in __user_groups 2015-10-15 10:53:56 -05:00
Jonathan A. Kollasch
cdd5f380c4 use passwd database instead of shadow database on NetBSD too 2015-10-15 10:44:22 -05:00
Jonathan A. Kollasch
cef2b32663 don't use the non-existant gshadow database on NetBSD either 2015-10-15 10:42:11 -05:00
Jonathan A. Kollasch
185d7f593a Treat NetBSD the same as FreeBSD and OpenBSD in 'stat' explorers 2015-10-15 10:22:46 -05:00
Jonathan A. Kollasch
ed75374b95 support NetBSD in __timezone type 2015-10-15 10:12:11 -05:00
David Hürlimann
90f3f81c39 Added advertise-wan as optional parameter for consul 2015-08-28 01:25:05 +02:00
David Hürlimann
0057ee5558 Added new version for consul 2015-08-15 22:04:27 +02:00
David Hürlimann
ef98c54989 Added retry-join-wan to consul parameters 2015-08-14 22:54:55 +02:00
Steven Armstrong
d2dd706a1a Merge remote-tracking branch 'telmich/master' 2015-08-13 20:48:08 +02:00
Steven Armstrong
c3bf4c7b61 correctly merge and reformat custom json into generated config 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-08-13 20:45:31 +02:00
Dmitry Bogatov
7d6990d933 By default, package is not autoremoved, if it either suggested or 
recommened, but not is dependency for some other.  With this change,
either package is dependency of manually installed, either is is subject
to autoremove.
 2015-07-29 11:13:07 +02:00
Steven Armstrong
31dddca0db update params 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-07-24 00:24:10 +02:00
Steven Armstrong
543d79a7b5 drop support for <0.10.0 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-07-24 00:21:08 +02:00
Steven Armstrong
6fb35c7d90 make 0.10.0 the default version 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-07-23 23:36:20 +02:00
Steven Armstrong
a234912406 support version 0.10.0 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-07-23 23:33:52 +02:00
Steven Armstrong
c4aef429c2 dont use consul leave to shutdown, just kill instead 
If all servers in a cluster leave, the cluster is basically destroyed.
Servers are supposed to just die without leaving, otherwise rejoin no
longer works and manual recovery is required.

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-07-23 23:19:33 +02:00
Steven Armstrong
b515601c9c create /var/run/consul with permissions suitable for storing unix sockets 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-07-23 22:06:16 +02:00
Steven Armstrong
6662535c28 Merge remote-tracking branch 'telmich/master' 2015-07-10 13:59:44 +02:00
Dominique Roux
97dc358dc6 added new section 2015-06-15 15:57:11 +02:00
Dominique Roux
879ddefbdf added second example for additional rsync options 2015-06-11 11:06:24 +02:00
Dominique Roux
d91b478ae0 added rsync(1) in see also 2015-06-11 08:54:34 +02:00
Dominique Roux
036f90165e updated man.txt 
inserted beginning "--" in front of every rsync-opts
 2015-06-11 08:52:12 +02:00
Dominique Roux
4f375a03c1 - added COPYING info 
- added parameter rsync-opts
work need to be done:
- the rsync-opts gets ignored by cdist since the opts are --[OPTS] like and cdist takes this as a own parameter
 2015-06-10 16:50:18 +02:00
Steven Armstrong
6c47dfbd54 Merge remote-tracking branch 'telmich/master' 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-06-01 10:31:53 +02:00
Steven Armstrong
085a7c8ce1 work in progress: start upgrading consul-template to 0.9.0 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-05-28 22:26:51 +02:00
Steven Armstrong
a1f1b3540d +consul 0.5.2 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-05-22 21:13:55 +02:00
Steven Armstrong
47daae1aa2 Revert "__consul type requires unzip to be installed" 
This reverts commit 45df8dca11.
 2015-05-22 21:09:03 +02:00
Nico Schottelius
39326cb03a Merge branch 'no-dot-cdist' 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-20 17:11:36 +02:00
Nico Schottelius
b68091e032 integrate __pacman_conf_integrate 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-20 17:00:35 +02:00
Nico Schottelius
2985bd709a Merge remote-tracking branch 'dominique/newtype_pacman' 2015-05-20 14:06:04 +02:00
Dmitry Bogatov
10735ffb84 Description: Fix spelling in manuals 
Forwarded: yes
Last-Update: 2015-05-14
 2015-05-19 11:58:50 +02:00
Dominique Roux
62e1ecdd08 changed if statement: 
from if [  !=  ];
to
if [  ];
 2015-05-19 08:18:33 +02:00
Nico Schottelius
3073aea3f8 Merge remote-tracking branch 'origin/master' 2015-05-16 17:46:27 +02:00
Nico Schottelius
10662c48df +consul 0.5.1 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 17:43:46 +02:00
Nico Schottelius
8819f54116 comparision in shell is =, not == 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 17:40:27 +02:00
Nico Schottelius
45df8dca11 __consul type requires unzip to be installed 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 16:49:48 +02:00
David Hürlimann
4ffde06fe8 Added centos to type __locale 2015-05-13 13:44:55 +02:00
Dominique Roux
672aa13316 Second forgotten exit 2015-05-13 13:28:48 +02:00
Dominique Roux
1ad4125a3b Add exit if file is specified 2015-05-13 13:12:25 +02:00
Dominique Roux
f0fd3e4608 small bugfixes 2015-05-13 12:55:18 +02:00
Nico Schottelius
2ea6d41c38 Merge pull request #396 from dheule/bugfix__user_groups 
fix for older linuxes where gpasswd doesn't have the relevant options…
 2015-05-13 10:25:28 +02:00
David Hürlimann
eba3c85b9c Changed the header of firewall type 2015-05-13 00:26:05 +02:00
Dominique Roux
1690c9d8ff Bugfixes: 
-Added GPLv3 header
-Set correct '=' in man.text
-Now uses default values cdist-like
-Replace arrays with plain variables
-Rewrote the error message
 2015-05-12 19:12:49 +02:00
David Hürlimann
675321b444 Added a new manifest for installing firewall package 2015-05-12 17:54:00 +02:00
Dominique Roux
94e059a293 Added types 
__pacman_integrate: converts normal pacman.conf to cdist conform
__pacman_conf: Manage pacman.conf with cdist
 2015-05-12 14:26:38 +02:00
Nico Schottelius
28c534445b add Debian 8 support / systemd in __start_on_boot 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-12 01:13:20 +02:00
Nico Schottelius
27fd52f472 systemd for debian 8 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-12 01:02:48 +02:00
Daniel Heule
b2aeceae91 minor optimisation ... 2015-05-11 10:18:27 +02:00
Daniel Heule
e89ca14e66 autodedtection of old usermod implementations ... 2015-05-11 09:06:27 +02:00
Daniel Heule
56168cda65 fix for older linuxes where gpasswd doesn't have the relevant options ... 2015-05-08 14:21:39 +02:00
Daniel Heule
62bd5898aa fix for older linuxes where gpasswd doesn't have the relevant options ... 2015-05-08 14:08:53 +02:00
Dominique Roux
40d19a6bbb Change from cat a variable to echo a variable 2015-05-08 10:03:03 +02:00
Nico Schottelius
057f4c1be7 Merge pull request #381 from acatton/cleanup-default-parameters 
Types default values handeling cleanup
 2015-03-19 15:44:37 +09:00
Nico Schottelius
5566062139 add debian support to __consul_agent 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-16 19:00:47 +01:00
Steven Armstrong
5239943bed confirmed to work on ubuntu 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-03-06 14:25:53 +01:00
Nico Schottelius
b0321895a7 fix all tests 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 19:20:06 +01:00
Nico Schottelius
b51e9daccc fix all tests besides one 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 18:51:25 +01:00
Nico Schottelius
d08c29b581 fix most test cases broken by no-dot-cdist change 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 18:32:47 +01:00
Steven Armstrong
8820c1ca2b add support for acl options 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-03-05 16:39:14 +01:00
Steven Armstrong
29cb89340e bugfix: /___key_value/__key_value/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-03-05 15:59:24 +01:00
Nico Schottelius
fa6e389fdd cannot use False for object id, as it is being used for os.path.join() in object 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 15:23:53 +01:00
Nico Schottelius
73c77dd2d3 Let core use random .cdist directory for objects 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 15:02:26 +01:00
Nico Schottelius
ff00df72ad Merge branch 'master' into no-dot-cdist 2015-03-05 11:08:49 +01:00
Nico Schottelius
9af4fcabff make firewalld more quiet 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-01 21:21:57 +01:00
Nico Schottelius
70a5e012d8 need to issue rules twice (permanent & current) 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-01 21:04:25 +01:00
Nico Schottelius
e7308a1a61 use absent instead of present twice 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-01 20:57:16 +01:00
Nico Schottelius
64e22bdb11 add new cdist type: __firewalld_rule 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-01 18:49:40 +01:00
Steven Armstrong
72104184b5 ensure file exists 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-28 01:05:59 +01:00
Steven Armstrong
4061031035 add centos support to __postfix* types 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-28 01:03:15 +01:00
Steven Armstrong
0fe6b60efc support for centos 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-28 01:03:15 +01:00
Christian Kruse
583aa41bf9 support FreeBSD in __timezone type 2015-02-27 02:08:06 +01:00
Steven Armstrong
79b16563ed remove support for custom install location 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-25 00:22:38 +01:00
Steven Armstrong
b1ef2cffa4 hardcode path to binary 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-25 00:19:10 +01:00
Steven Armstrong
2bcaaa744f remove support for custom install location; to much dependencies in other types 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-25 00:16:10 +01:00
Steven Armstrong
3c720640dd start working on supporting different versions of consul-template 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 23:59:06 +01:00
Steven Armstrong
2677130e0c Merge remote-tracking branch 'telmich/master' 2015-02-24 23:14:49 +01:00
Steven Armstrong
44d57497e0 first attempt to make this type actually work 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 23:05:25 +01:00
Nico Schottelius
40a582ca45 remove config_dir from the consul configuration file - fixes #385 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-24 20:43:31 +01:00
Steven Armstrong
2c7ab566e1 add new types to manage consul and friends 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 13:10:17 +01:00
Steven Armstrong
4f7ae8425d New type __staged_file: Manage staged files 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 13:01:48 +01:00
Steven Armstrong
041569b41c new type __config_file to manage configuration files 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 12:47:51 +01:00
Nico Schottelius
4496c579af add warning for __rsync 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-18 10:22:34 +01:00
Nico Schottelius
0ddc848b1e add missing leading / to destination in case object_id is taken 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-12 16:21:15 +01:00
Nico Schottelius
34253a5c30 update missing bits for __rsync 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-12 10:35:07 +01:00
Nico Schottelius
9d25295e1a use source, not source dir 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-11 16:44:15 +01:00
Nico Schottelius
055eaed7ad add hint for / 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-11 16:01:22 +01:00
Nico Schottelius
3cc2f13b9b add initial version of __rsync 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-11 15:56:45 +01:00
Nico Schottelius
745f1e2984 support ubuntu upstart in __start_on_boot 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-10 23:27:43 +01:00
Steven Armstrong
26143b8b77 move code generation outside of loop 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-10 22:44:08 +01:00
Steven Armstrong
7d73cc5ed6 actually use new --state param 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-10 22:44:08 +01:00
Steven Armstrong
d247f083e8 cleanup and rewrite 
- add new --state parameter and support for deleting groups
- add new --system parameter to create system groups if supported by the
  os
- remove special case for legacy redhat/centos versions, they are long
  gone

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-10 22:44:08 +01:00
Nico Schottelius
0cf170b18e prettier print when requirements are broken 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-10 21:59:39 +01:00
Nico Schottelius
f2b1c24ec3 Merge pull request #382 from acatton/fix-dir-in-default 
Cdist fails silently when there's a directory in __type/parameter/default
 2015-01-09 11:30:25 +01:00
Nico Schottelius
42c393ca40 add ubuntu support to __locale 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-01-06 15:35:30 +01:00
Antoine Catton
2318c792d7 Fix test cdist_type.TypeTestCase.test_directory_in_default 2015-01-04 12:43:57 -07:00
Antoine Catton
9717d5d928 Add test case: what if there's a directory in defaults 
The goal of the directory name is to be before foo and bar
 2015-01-04 12:43:57 -07:00
Antoine Catton
a938468bb0 DRY: Remove default parameter value handeling in __package_rubygem 2014-12-27 20:48:42 -07:00
Antoine Catton
33cc3b0fa2 DRY: Remove default parameter value handeling in __package_pkg_openbsd 2014-12-27 20:47:30 -07:00
Antoine Catton
ebf0479f60 DRY: Remove default parameter value handeling in __package_pkgng_freebsd 
flavor, repo and version are expected to be empty by default.
They're all checked with [ -n "$var" ]
 2014-12-27 20:44:47 -07:00
Antoine Catton
f7bf6a058e DRY: Remove default parameter value handeling in __package_pkg_freebsd 
flavor, pkgsite and version are expected to be empty.
They're all checked with [ -n "$var" ]
 2014-12-27 20:42:03 -07:00
Antoine Catton
9fd285da4c DRY: Remove default parameter value handeling in __package_pip 2014-12-27 20:35:53 -07:00
Antoine Catton
5aaea37194 DRY: Remove default parameter value handeling in __package_pacman 2014-12-27 20:34:38 -07:00
Antoine Catton
65f50b64b7 DRY: Remove default parameter value handeling in __package_opkg 2014-12-27 20:32:49 -07:00
Antoine Catton
de282c50f3 DRY: Remove default parameter value handeling in __package_luarocks 2014-12-27 20:31:46 -07:00
Antoine Catton
601346d482 DRY: Remove default parameter value handeling in __package_apt 2014-12-27 20:29:45 -07:00
Antoine Catton
0844f717a8 Password is unused in the else branch 2014-12-27 20:26:29 -07:00
Antoine Catton
82f48ef271 DRY: Remove default parameter value handeling in __apt_source 2014-12-27 20:12:34 -07:00
Antoine Catton
17afb5f5ad DRY: Remove default parameter value handeling in __apt_source 2014-12-27 20:12:29 -07:00
Nico Schottelius
77b96b97c8 fix #343 - close fds of mkstemp for messages 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-12-09 19:54:49 +01:00
Nico Schottelius
dd562befc9 add support for --target-release for __package_apt 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-11-25 23:00:17 +01:00
Nico Schottelius
38d27d8769 Merge branch 'issue/372' of https://github.com/asteven/cdist 2014-10-23 16:27:52 +09:00
Nico Schottelius
4a0380ab65 Merge branch 'issue/369' of https://github.com/asteven/cdist 2014-10-23 16:27:29 +09:00
Steven Armstrong
28027f4261 dont fail just because grep in subshell exited non-zero 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-10-22 14:32:32 +02:00
Nico Schottelius
b724881c6a remove superfluous = from title to allow building when xsltproc is strict 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-10-17 12:46:49 +09:00
Steven Armstrong
9f83622d38 remove legacy/unused explorer 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-10-07 16:36:01 +02:00
Ricardo Catalinas Jiménez
967652b5fe Make __package_{update_index,upgrade_all} quieter 
And more non-interactive for the APT case.
 2014-10-05 16:00:10 +01:00
Ricardo Catalinas Jiménez
5cfe569369 Make __package_apt even more non-interactive 2014-10-05 15:59:27 +01:00
Nico Schottelius
a6c37d688b Merge branch 'bugfix_type__package_emerge' of https://github.com/dheule/cdist 2014-10-02 15:20:08 +02:00
Ricardo Catalinas Jiménez
81bd4c3338 Add types __package_{update_index,upgrade_all} 2014-09-29 23:53:29 +01:00
Ricardo Catalinas Jiménez
ff880b4287 Fix comment 2014-09-29 22:37:50 +01:00
Ricardo Catalinas Jiménez
fd6b90a736 Cosmetic 2014-09-29 22:37:50 +01:00
Nico Schottelius
58ab351da3 Merge remote-tracking branch 'jake/__pkgng' 2014-09-29 21:18:31 +02:00
Nico Schottelius
7fab50a82b Merge remote-tracking branch 'steven/issue/365' 2014-09-29 20:48:45 +02:00
Daniel Heule
c70834eaff implemented some sugestions from nico 2014-09-29 17:28:45 +02:00
Steven Armstrong
41782cb107 workaround special case where the desired key was already present more then once in target file 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-29 14:47:25 +02:00
Nico Schottelius
8a56883d83 Merge branch 'osx-explorers' of https://github.com/mhutter/cdist 2014-09-29 11:14:33 +02:00
Steven Armstrong
4c52b10f93 maybe better define variable _before_ using it 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-29 10:57:27 +02:00
Steven Armstrong
4125dfaab0 them files should end in newline stupid 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-29 10:46:00 +02:00
Steven Armstrong
b17a1f0edb removing and adding keys must be atomic 
If we delegate this to multiple seprarate objects (e.g. using __line) and the
config run is interrupted after applying only some of them we may leave the
target in some random state.
We may have even locked ourself out of the target.

So remove and add keys ourself so either none are all changes are
applied.

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-27 11:40:06 +02:00