romain-dartigues/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity
3331 commits 111 branches 0 tags 19 MiB
Commit graph

514 commits

Author SHA1 Message Date
Nico Schottelius
0d46dc3367 fix manpages of __pf_ruleset and __pf_apply 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:38:14 +02:00
Nico Schottelius
410e0ba8fa Merge branch 'master' into 2.1 
Conflicts:
	conf/type/__package/man.text
	conf/type/__package_apt/man.text
	conf/type/__package_luarocks/gencode-remote
	conf/type/__package_luarocks/man.text
	conf/type/__package_pacman/gencode-remote
	conf/type/__package_pacman/man.text
	conf/type/__package_pkg_openbsd/gencode-remote
	conf/type/__package_pkg_openbsd/man.text
	conf/type/__package_rubygem/gencode-remote
	conf/type/__package_rubygem/man.text
	conf/type/__package_yum/gencode-remote
	conf/type/__package_yum/man.text

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-15 15:39:08 +02:00
Nico Schottelius
6eced94035 Merge branch '__package_state_fix' of https://github.com/jdguffey/cdist 2012-10-07 18:48:07 +02:00
Jake Guffey
1fef54ecdf Fix __package* state usage 
Removed __package*/parameter/required
Added state to __package*/parameter/optional
Modified man pages for __package*
Added optional check for state parameter
Defaulted state parameter to "present"
 2012-10-07 11:51:15 -04:00
Nico Schottelius
61394f3909 correct comment 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-04 10:10:41 +02:00
Nico Schottelius
8c0228bbaa allow failing cat on optional parameter 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-02 18:09:52 +02:00
Nico Schottelius
748fc8a258 support installing, even if rvm is already present 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-02 18:06:15 +02:00
Nico Schottelius
62c69c63b5 support root and user rvm 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-02 18:05:47 +02:00
Nico Schottelius
21ca688e63 Merge pull request #99 from jdguffey/__pf_apply 
__pf_apply
 2012-10-01 08:47:49 -07:00
Nico Schottelius
12e1d16efd Merge pull request #98 from jdguffey/__pf_ruleset 
_pf_ruleset
 2012-10-01 08:47:35 -07:00
Jake Guffey
9a45333e82 Implement Nico's suggestions 
Removed unnecessary code from gencode-remote
 2012-09-21 10:11:56 -04:00
Jake Guffey
6afec72232 Implement Nico's suggestions 
Modified behavior of cksum explorer to print nothing if the file doesn't exist
Modified gencode-local to reflect cksum's new behavior
Modified gencode-remote to check states explicitly and error on invalid state.
 2012-09-21 10:06:16 -04:00
Nico Schottelius
1b80f2806b remove installed/removed state parameters (2.1 cleanup) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 11:32:04 +02:00
Nico Schottelius
bc203df95f update man for 2.1 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 11:12:32 +02:00
Nico Schottelius
e82c11cce4 add changes for 2.1 boolean version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 11:10:38 +02:00
Nico Schottelius
3140c009d3 Merge branch 'master' into 2.1 2012-09-21 11:09:26 +02:00
Nico Schottelius
135299357b correctly setup state 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 11:08:55 +02:00
Nico Schottelius
30323456bf cleanup gencode-remote 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 11:03:53 +02:00
Nico Schottelius
1e765d7e77 remove parameter changing manifest 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 10:43:11 +02:00
Nico Schottelius
e4d1ea5bc9 change --parents and --recurse to boolean 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-21 10:40:37 +02:00
Nico Schottelius
b1b86b2ebf remove __addifnosuchline and __removeline in 2.1 branch 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 17:46:03 +02:00
Nico Schottelius
a49665ce3d add WARNING prefix 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 17:43:28 +02:00
Nico Schottelius
d351029cea deprecate __addifnosuchline and __removeline 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 17:42:01 +02:00
Nico Schottelius
1e3f0749fc setup line content early 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 17:39:14 +02:00
Nico Schottelius
9e40d7bc91 clarify relation between line and regex 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 17:35:14 +02:00
Nico Schottelius
fd490b39f1 add parameter 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 15:25:05 +02:00
Nico Schottelius
5a154fa0a2 first gencode version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 13:20:30 +02:00
Nico Schottelius
7b571c53dd add explorer 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 11:10:10 +02:00
Nico Schottelius
8ca3846a3a begin with the new manual page 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-20 10:42:16 +02:00
Jake Guffey
058625cc68 Merge branch 'master' into __pf_apply 2012-09-19 17:53:07 -04:00
Jake Guffey
5f435c1be7 Merge branch 'master' into __pf_ruleset 2012-09-19 17:53:07 -04:00
Jake Guffey
c01a7ebc45 Left out ; then 2012-09-19 17:37:19 -04:00
Jake Guffey
07c5a9b49e Migrate conditional syntax 
set -e doesn't like [ X ] && Y syntax, migrate to if [ X ]; then Y; fi
 2012-09-19 17:33:42 -04:00
Jake Guffey
d77c67b56f set -e doesn't like [ blah ] && blah syntax 
changed to if [ blah ]; then blah; fi format
migrated echo usage to cat with HEREDOC to improve readability
 2012-09-19 17:27:40 -04:00
Jake Guffey
7a67f8bc16 Make code match up with comments 
If pf was already disabled, the code would exit upon trying to disable it again
 2012-09-19 17:18:45 -04:00
Jake Guffey
a1793f66ff Add logic to check for existence of files before interacting with them 
if ${rcvar} or ${rcvar}.new don't exist, we can't rm/mv them.
 2012-09-19 17:16:00 -04:00
Jake Guffey
34ca94ffa2 Fix typo 
referenced ${rcvar.old} rather than ${rcvar}.old
 2012-09-19 17:10:48 -04:00
Jake Guffey
269b9eff84 Escape inner variable 
ret was being set and checked in generated code but the $ wasn't being escaped
 2012-09-19 17:07:56 -04:00
Jake Guffey
629f751726 Removed ${rcvar} but never renamed ${rcvar}.new 
Was trying to load ${rcvar} into pf, but couldn't because new ruleset was never renamed.
 2012-09-19 17:04:03 -04:00
Jake Guffey
613305e923 Fix typo 
Generated code had unterminated string in first check, causing future check to fail
 2012-09-19 17:00:22 -04:00
Jake Guffey
995265d4a6 Allow pfctl -[de] to return 1 
If pf is already enabled or disabled and we try to enable/disable it again, it returns 1.
 2012-09-19 16:42:15 -04:00
Jake Guffey
205f32c78b Fixed generated code and explorer 
Generated code needed subshell escaped
Explorer wasn't parsing output of cksum properly
 2012-09-19 16:37:18 -04:00
Jake Guffey
08aa7d8e83 Fleshed out gencode-remote logic 
Added logic into gencode-remote to enable/disable pf
Added logic into gencode-remote to apply the new ruleset if necessary
Added explorer to find ${rcvar}
 2012-09-19 16:15:06 -04:00
Jake Guffey
c551bbbb69 Initial commit 
Initial commit of __pf_apply type before actually creating logic
 2012-09-19 15:49:36 -04:00
Nico Schottelius
52583e696f add manpage 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-19 21:32:47 +02:00
Nico Schottelius
f6de6d8957 begin type __qemu_img 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-09-19 21:29:44 +02:00
Jake Guffey
a2e96ac435 Initial commit 
Broke old __pf type into __pf_*
Initial commit of __pf_ruleset type with basic logic
 2012-09-19 14:50:28 -04:00
Jake Guffey
16ac158c41 Add FreeBSD support 
Added support for FreeBSD's mktemp
Fixed typo in generated script with one too many "s
 2012-09-13 17:17:37 -04:00
Jake Guffey
1ad176aa63 Fixed use of onboot parameter 
onboot parameter was being checked against "true" but was being set as "yes/no"
 2012-09-07 10:02:37 -04:00
Jake Guffey
1116bcc504 Migrate from useradd/usermod to pw 
useradd/usermod don't exist in freebsd.
 2012-08-14 08:39:33 -04:00