Commit graph

3489 commits

Author SHA1 Message Date
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
17858ebd00 ++changes(2.0.15)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-19 21:33:16 +02: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
Nico Schottelius
c88d648520 ++changes(2.0.15)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-07 14:44:04 +02:00
Steven Armstrong
57bd7b2fd3 Merge remote-tracking branch 'telmich/master' into issue__object_name-in-type-explorer 2012-09-07 14:22:53 +02:00
Steven Armstrong
0775b84c40 bugfix: make __object_name available in type explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-09-07 14:22:27 +02:00
Nico Schottelius
b6bff3a551 version bump
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-07 14:06:19 +02: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
Nico Schottelius
2be4b36da0 Merge pull request #86 from asteven/global-explorer-fixup
ignore errors in global explorers
2012-08-03 01:54:13 -07:00
Nico Schottelius
590a9e5026 ++changes(2.0.14)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-07-09 17:57:12 +02:00
Nico Schottelius
8fb5bc33b9 Merge branch 'master' of github.com:telmich/cdist 2012-07-09 17:56:58 +02:00
Nico Schottelius
792ba65194 Merge pull request #82 from jdguffey/__group
Add FreeBSD support
2012-07-09 08:54:32 -07:00
Nico Schottelius
676687dee1 add hint for building from source
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-06-28 14:05:44 +02:00
Steven Armstrong
d13a201cd0 /which/command -v/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-06-25 20:19:10 +02:00
Jake Guffey
04f4a5ae5b Merge branch 'master' into __group 2012-06-25 13:32:19 -04:00
Jake Guffey
fbdbbddf3b Align messages for "password" parameter
Use same general message if the "password" parameter is given for a FreeBSD target host whether the group exists yet or not
Make language clearer surrounding the default case
2012-06-25 13:29:10 -04:00
Jake Guffey
946d2b9d43 Change order of checks
per telmich's suggestion in https://github.com/telmich/cdist/pull/82/files#r1043875
2012-06-25 13:19:19 -04:00
Nico Schottelius
686554358a ++changes(2.0.14)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-06-25 19:12:00 +02:00
Nico Schottelius
74f5a4a6c6 Merge pull request #83 from jdguffey/__user
Don't use shadow passwords on FreeBSD
2012-06-25 10:11:02 -07:00
Jake Guffey
2aee33fe06 Merge branch 'master' into __group 2012-06-22 11:09:34 -04:00
Jake Guffey
6dafb3a01c Merge branch 'master' into __user 2012-06-22 11:09:34 -04:00
Nico Schottelius
d707f9feeb Merge pull request #87 from asteven/issue__package_pacman-absent
sync and remove require different options
2012-06-22 06:39:02 -07:00
Steven Armstrong
b09d9786d2 sync and remove require different options
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-06-22 15:36:14 +02:00
Steven Armstrong
2856684e51 ignore errors in global explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-06-22 09:30:47 +02:00
Nico Schottelius
0cae1b44f9 Merge pull request #85 from jdguffey/__jail
Don't symlink multiple times
2012-06-21 23:42:30 -07:00
Jake Guffey
ba576b3931 Don't symlink multiple times
Was checking for existence of $jaildir/home -- never exists; will always create new symlink
Changed to look for directory or symlink at $jaildir/base/home and respond accordingly
2012-06-21 11:59:53 -04:00
Jake Guffey
6264a9b718 Don't use shadow passwords on FreeBSD
shadow database doesn't exist by default in FreeBSD -- use "passwd" database
2012-06-20 17:22:19 -04:00
Jake Guffey
f6bd5290b3 Add FreeBSD support
Modified explorer/gshadow to do nothing on FreeBSD (unsupported command)
Modified gencode-remote to use short options (--long not supported in FreeBSD)
2012-06-20 17:14:47 -04:00
Nico Schottelius
37eabffd9c ++changes(2.0.14)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-06-19 14:17:50 +02:00
Sébastien Gross
61030f1c18 Remove local variables statements.
Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-06-19 10:55:50 +02:00
Sébastien Gross
d591b5f2be Do not use global variable.
Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-06-19 10:29:20 +02:00
Sébastien Gross
2a20b01a3f Shorten option for both useradd and usermod.
We need to shorten options for both usermod and useradd since on some
systems (such as *BSD, Darwin) those commands do not handle GNU style long
options.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-06-18 17:54:19 +02:00
Nico Schottelius
f23e869277 ++changes(2.0.14)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-06-15 13:32:12 +02:00