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

1096 commits

Author SHA1 Message Date
Daniel Heule
f7de217129 modified the unknown case to empty... 2016-03-25 16:39:48 +01:00
Daniel Heule
9c6d7dbd89 modified the unknown case ... 2016-03-24 11:29:13 +01:00
Daniel Heule
2c49e04c98 Updated the exlorer for more systems 
changed the ps syntax, so it should work on freebsd to
  added a case so it could easy implemented for other os to
 2016-03-24 11:22:09 +01:00
Daniel Heule
d3a0bd20c0 replace egrep with awk functions 2016-03-24 10:58:14 +01:00
Daniel Heule
14f3ee403a fix fo __start_on_boot for ALL systemd distros 2016-03-23 16:34:57 +01:00
Pierre
b749a4b88a consul changes 2016-03-23 15:47:31 +01:00
Daniel Heule
0179904675 bugfix for newer zypper (SLES12SP1) releases, different column numbers in output 2016-03-22 11:01:19 +01:00
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
Nico Schottelius
85c825438e update manpage of __install_generate_fstab (typo) 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-28 15:37:30 +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
Nico Schottelius
4a5bd2069f Merge branch 'master' into feature_install_and_preos 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-19 15:16:56 +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
72bf86646d Merge branch 'master' into feature_install_and_preos 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-18 14:42:07 +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
Nico Schottelius
ac866107fa Merge remote-tracking branch 'origin/master' into feature_install_and_preos 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 16:44:11 +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
bcaca9c268 Merge branch 'preos' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-05 13:54:38 +02:00
Nico Schottelius
56c7431467 __cdist_preos enhancements 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-05 13:53:47 +02:00
Nico Schottelius
1b1b345263 add initial type for building preos 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-28 03:20:28 +09:00
Nico Schottelius
e177bac054 Merge branch 'master' into preos 2015-03-28 03:06:15 +09: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
c4301696b0 Merge branch 'master' into preos 2015-02-10 22:01:18 +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
494b6cbbf9 Merge branch 'master' into 4.0-pre-not-stable 2014-12-11 17:13:52 +01: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
Steven Armstrong
eed058426a fix that stupid stdin is truncated bug again 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-25 16:35:19 +02:00
Steven Armstrong
68586a0c3d new type to manage a single ssh authorized_key entry 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-25 16:23:38 +02:00
Steven Armstrong
ffd2935cc4 complete rewrite 
- add support for authorized_keys options see sshd(8)
- add support for explicit comment after key
- do not allow a key to exist more then once in an authorized_keys file
- remove all conflicting keys

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-09-25 16:16:15 +02:00
Steven Armstrong
5a895480b7 Merge remote-tracking branch 'telmich/master' 2014-09-24 15:18:40 +02:00
Ricardo Catalinas Jiménez
60b2bbf4c9 Fix messaging variables not exported in type manifest 2014-09-21 11:52:38 +01:00
Jake Guffey
6eff4bb898 Implemented telmich's suggestions 
Using $($__explorer/os), command -v directly
Fix spacing
Fix copyright year
 2014-09-17 17:43:29 -04:00
Nico Schottelius
339167c23c catch some errors 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-09-14 13:51:13 +02:00
Nico Schottelius
3244cfae85 Merge branch 'master' of https://github.com/jimenezrick/cdist into preos 2014-09-14 13:47:53 +02:00
Ricardo Catalinas Jiménez
3223a38889 Fix typo in cdistmarker doc 2014-09-13 23:31:38 +01:00
Jake Guffey
37a8b4af2b Minor fixes 
Fixed pkgng_exists explorer (can't reference $__global)
Fixed logic in __package/pkgng_freebsd/gencode-remote
   Wasn't installing package if it already exists, but after explorer execution
 2014-09-10 15:54:13 -04:00
Nico Schottelius
9ecbf9f1cc Merge branch 'master' into preos 2014-09-10 17:47:24 +02:00
Tomas Pospisek
44941137d6 change implementation and API of __package_dpkg 
__package_dpkg wasn't working as intended - being a singleton meant
that it could only install one package. Now we missuse
/var/cache/apt/archives to copy our package into and `dpkg -i` from
there
 2014-09-10 11:21:09 +02:00
Jake Guffey
e87b26f2de Introduce __package_pkgng_freebsd type 
Create __package_pkgng_freebsd type to handle package management via pkg-ng
Add requirement generation in __package/manifest
Add explorer inside __package to find if pkg-ng is installed on the target
 2014-09-09 17:10:32 -04:00
Tomas Pospisek
8b53003a16 add __postgres_extension type 2014-09-09 15:42:30 +02:00
Steven Armstrong
a956583169 Merge remote-tracking branch 'telmich/master' 2014-08-20 13:03:35 +02:00
Tomas Pospisek
d8af4d3ad5 fix email address 2014-08-18 19:42:35 +02:00
Tomas Pospisek
82bcc83d41 add new __package_dpkg type 2014-08-18 19:42:26 +02:00
Nico Schottelius
249455f347 also support archlinux in __locale 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-08-17 12:03:46 +02:00
Steven Armstrong
3dbe375837 no need to double escape a trailing $; $ by itself is not special in any way 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-07-28 15:05:45 +02:00
Steven Armstrong
fff5e48266 /index/match/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-07-28 15:04:48 +02:00
Daniel Heule
1e582dceec bugfix of raw_command 
with raw_command, you can set env variables in crontab,
but cron don't accept env vars if the definition is
like this:
SHELL=/bin/bash # marker of something ...
so we need to make sure that raw commands are not apended by a marker
 2014-07-23 09:22:03 +02:00
Nico Schottelius
c6ad2e60b3 remove obsolete todos ... people believe they still need to be fixed! 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-26 17:11:35 +02:00
Nico Schottelius
37451590b1 add reset to iptables init.d script 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-26 15:24:42 +02:00
Daniel Heule
614c73e10e correct date of c 2014-06-25 00:18:41 +02:00
Daniel Heule
ab6502c9df correct match if / is the last char of a url and the end of the line 2014-06-25 00:16:40 +02:00
Manuel Hutter
981f8068d2 code diet on "memory" 2014-06-21 14:24:10 +02:00
Manuel Hutter
e727824964 cat and pipe diet 2014-06-18 10:19:21 +02:00
Manuel Hutter
c36fba4b99 Fixed global explorers on OSX 2014-06-17 19:04:22 +02:00
Nico Schottelius
d294a2c28e +" 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-16 08:02:41 +02:00
Nico Schottelius
6a2f2352be new type: __ssh_dot_ssh 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-16 07:57:10 +02:00
Nico Schottelius
a1d78384f9 Merge branch 'preos' into 4.0-pre-not-stable 2014-06-13 16:29:29 +02:00
Markus Koller
3d82a0d25c Set hostname in preos 2014-06-13 14:56:24 +02:00
Nico Schottelius
5f9eef3bbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-06-13 13:34:42 +02:00
Nico Schottelius
9bf2d58a8f Merge branch 'master' into install_integration 2014-06-13 13:34:31 +02:00
Nico Schottelius
3b4258c34e Merge branch 'master' into preos 2014-06-13 13:33:28 +02:00
Nico Schottelius
efb2c4a163 Merge branch 'fix-file-stat-osx' of https://github.com/mhutter/cdist 2014-06-11 00:35:01 +02:00
Nico Schottelius
3592a0c6dd +suse support in __locale and __hostname 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-10 23:50:53 +02:00
Nico Schottelius
17504975a6 suse support for __timezone 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-10 23:15:21 +02:00
Manuel Hutter
8a70343e2c Fixed wrong mode format for stat on OSX. 2014-06-10 19:48:02 +02:00
Manuel Hutter
90acfc3952 Fixed stat on OSX 2014-06-10 19:19:26 +02:00
Daniel Heule
9bac6da6c9 bugfix emerge type for slotted packages 2014-06-09 15:42:17 +02:00
Nico Schottelius
bbd451433f add --url support for __package_yum 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-20 07:43:11 +02:00
Nico Schottelius
c363fc24de begin to make OBJECT_MARKER dynamic 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-06 00:28:18 +02:00
Nico Schottelius
ae53b8e381 Merge branch 'bugfix__zypper' of https://github.com/dheule/cdist 2014-05-05 22:32:54 +02:00
Nico Schottelius
47ba46400c Merge pull request #325 from jdguffey/__jail_messaging 
Added messaging support for __jail type
 2014-05-04 08:52:48 +02:00
Nico Schottelius
1bb897f9a2 Merge pull request #312 from asteven/issue/312 
all files cdist creates should allways end with newline
 2014-05-04 08:50:30 +02:00
Nico Schottelius
1bfa281cec Merge pull request #334 from dheule/bugfix__explorer_interfaces 
bugfix the list of interfaces
 2014-05-04 08:43:12 +02:00
Nico Schottelius
bfbc621010 ++releasedate 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-29 18:10:50 +02:00
Daniel Heule
3710557c62 bugfix the list of interfaces 2014-04-29 12:57:46 +02:00
Daniel Heule
5a647ec763 Bugfix to auto import pgp keys for new repos, so we can add repos with new keys 2014-04-29 11:49:43 +02:00
Nico Schottelius
9127e06109 CentOS support for __hostname 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-25 01:48:58 +02:00
Steven Armstrong
8a4cc56266 ensure all files we create end with a single newline 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-04-22 11:04:02 +02:00
Nico Schottelius
f9783f5f77 Merge branch 'bugfix_issue_327' of https://github.com/dheule/cdist 2014-04-15 01:27:50 +02:00
Daniel Heule
c5152b75f2 rename parameter service_uri to uri as requested 2014-04-14 19:18:16 +02:00
Daniel Heule
831acd16c6 rename parameter repo_uri to uri as requested by nico 2014-04-14 19:14:29 +02:00
Steven Armstrong
40e517f50c new type __yum_repo to manage yum repositories 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-04-14 12:46:17 +02:00
Nico Schottelius
c818442ef2 also linke "files" subdir 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-12 19:40:41 +02:00
Jake Guffey
f7a6377b74 Updated man page 
Included MESSAGES section
 2014-04-07 09:44:28 -04:00
Jake Guffey
d12daf10c4 Added messaging support for __jail type 
prints start/stop/create/delete/onboot to $__messages_out
 2014-04-07 09:41:03 -04:00
Nico Schottelius
9eec4e22fb Merge branch 'bugfix_type__key_value' of https://github.com/dheule/cdist 2014-04-06 20:22:23 +02:00
Nico Schottelius
ad7977e51b ++;; 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-31 23:58:58 +02:00
Nico Schottelius
9ad7e05502 ++;; 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-31 23:58:45 +02:00
Nico Schottelius
84159d18e0 Merge branch 'master' into 4.0-pre-not-stable 2014-03-31 22:16:30 +02:00
Nico Schottelius
2955ef4344 cleanups 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-31 21:22:29 +02:00
Nico Schottelius
b7f8b5e339 catch unsupported state cases in __dog_vdi und __qemu_img 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-31 21:22:15 +02:00
Nico Schottelius
b22b581b67 first version of __dog_vdi 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-31 14:26:14 +02:00
Nico Schottelius
ff8f7ac287 add copied version __dog_vdi from __qemu_img 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-30 13:09:38 +02:00
Daniel Heule
50316902e3 renamed ll to lastline, hope its now clear what the var is for .. 2014-03-26 13:58:29 +01:00
Nico Schottelius
f3c3f454d3 Merge branch 'feature_new_explorers' of https://github.com/dheule/cdist 2014-03-26 13:06:33 +01:00
Daniel Heule
7b6102750e as requested, replace space with _ 2014-03-26 11:57:15 +01:00
Nico Schottelius
2c6e3e0e96 Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-03-26 11:19:09 +01:00
Nico Schottelius
73b54aab09 Merge branch 'issue/321' of https://github.com/asteven/cdist 2014-03-26 11:15:36 +01:00
Nico Schottelius
58d57bc532 Merge branch 'enhancement-package-pkg-openbsd' of https://github.com/ghettosh/cdist 2014-03-26 11:06:22 +01:00
Nico Schottelius
6e81bbc54b Merge branch 'issue/315' of https://github.com/asteven/cdist 2014-03-26 10:59:50 +01:00
Daniel Heule
bae472eb33 fixed some typos in the man page 2014-03-26 10:41:00 +01:00
Jake Guffey
c31278bcd0 Fix __jail explorers 
Only fixed gencode*, manifest in PR #279, fixed explorers here
 2014-03-25 12:50:27 -04:00
Daniel Heule
b7fb973fa5 bugfix for whitespace stripping, its no more simple 2014-03-21 09:35:47 +01:00
Daniel Heule
807e2902ea Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value 
New functionality for remote __object is needed
 2014-03-21 09:23:44 +01:00
Daniel Heule
f36dc11601 forgot myself to the headers .. 2014-03-20 17:22:07 +01:00
Daniel Heule
5ef27191fc implementing the $__object and $__object_id on the local and remote 
execution call, to allow read access to parameter files
 2014-03-20 13:52:12 +01:00
Nico Schottelius
2b03ccd776 changes for 3.1.0 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-19 18:57:11 +01:00
Nico Schottelius
bcca8a637b Merge branch 'master' into type__rbenv 2014-03-13 10:30:48 +01:00
Daniel Heule
619076bd2d corrected a small relict in example 2014-03-12 20:16:33 +01:00
Daniel Heule
a94de8fae4 Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value 
Conflicts:
	cdist/conf/type/__key_value/gencode-remote
 2014-03-12 20:07:27 +01:00
Steven Armstrong
5ec617fa3e ignore trailing slashes for comparison of source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-03-11 22:16:08 +01:00
Steven Armstrong
301b4e18ff either to it all, or fail; echo and cat suck, printf ftw! 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-03-11 21:07:20 +01:00
Daniel Heule
38c3d551ba bugfix, if file was absent and type is now tested on openwrt 2014-03-11 21:05:31 +01:00
Steven Armstrong
75c203a1f0 handle existing symlink but wrong source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-03-11 20:48:47 +01:00
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
ff897bc904 Merge branch 'master' into 4.0-pre-not-stable 2014-02-14 20:58:19 +01:00
Nico Schottelius
44f910d199 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-14 20:52:48 +01:00
Nico Schottelius
2734e5069e Merge branch '3.0' into 4.0-pre-not-stable 2014-02-14 20:52:36 +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
Nico Schottelius
ab8ae75837 Merge branch 'issue/297' of git://github.com/asteven/cdist 2014-02-14 01:48:03 +01:00
Steven Armstrong
f82a6224f2 use positional arguments in favour of keyword arguments for backwards compatibility with older python 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-13 21:05:37 +01:00
Steven Armstrong
46459053f4 use posix -L in favour of longopts 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-13 21:02: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
Steven Armstrong
17472bc17b Merge remote-tracking branch 'telmich/preos' into preos 
Conflicts:
	cdist/preos.py
 2014-02-12 22:44:31 +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
01a3f7c0b7 Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist 2014-02-12 16:56:30 +01:00
Nico Schottelius
32eee3b8e9 Merge branch 'master' into 4.0-pre-not-stable 2014-02-12 16:47:10 +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
cfbc68aa11 bugfix if both override and order is specified 2014-02-12 10:31:46 +01:00
Nico Schottelius
4031209f7b Merge branch 'bugfix_issue_102' of git://github.com/dheule/cdist 2014-02-11 22:30:24 +01:00
Daniel Heule
6a5f908269 yep, dryrun option has now a unittest, was hard to work out ... 2014-02-11 21:17:19 +01:00