Commit graph

659 commits

Author SHA1 Message Date
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
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
a3981f58fd Initial support for SuSE, including zypper, including __start_on_boot
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-06-15 10:24:36 +02:00
Nico Schottelius
34c528ea5b do not change parameter information, it's evil
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-06-15 10:03:26 +02:00
Jake Guffey
d0b96e22d4 Fix typo
symlink was backwards
2012-06-14 14:40:40 -04:00
Jake Guffey
c8fa79d053 Parameter change
Modified jailbase parameter such that it's only required when $state=present
2012-06-14 14:33:21 -04:00
Jake Guffey
055b3f0f53 bugfix
was filling jail_list with $jail_enable
2012-06-14 10:41:04 -04:00
Steven Armstrong
7ae1a2bc52 allow __file to read source file from stdin
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-06-04 14:17:42 +02:00
Nico Schottelius
f087057c98 use iproute2's ip, if available
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-31 19:30:51 +02:00
Nico Schottelius
029dc4c387 Merge branch 'ssh_authorized_key_group' of https://github.com/contradict/cdist 2012-05-31 19:23:53 +02:00
8564785f66 Ensure __ssh_authorized_key sets proper group
When --dstuser is specified, use an explorer to retrieve
the group name and specify the group name on all created
directories and files.
2012-05-30 17:21:19 -07:00
Sébastien Gross
fc6a54b3bd Fix email address.
Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-05-31 00:28:32 +02:00
Sébastien Gross
4b1c604e47 Fix type authors for manpage generation.
Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-05-31 00:23:28 +02:00
Nico Schottelius
d7f180c99f rename ifaces => interfaces (more explicit)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-30 18:34:14 +02:00
Nico Schottelius
a685e9556a Merge remote-tracking branch 'renard/explorer-ifaces' 2012-05-30 18:32:57 +02:00
Sébastien Gross
4f303ecb27 Fix ifconfig output parsing against various OSes.
Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-05-30 17:46:46 +02:00
Nico Schottelius
3cb85fc3f3 Bugfix __addifnosuchline: Missing quotes
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-30 15:57:44 +02:00
Sébastien Gross
cf980f2985 List all network interfaces in explorer/ifaces.
Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
2012-05-29 13:11:42 +02:00
Nico Schottelius
7c7a621875 fix manpage compile error
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-23 14:19:58 +02:00
Nico Schottelius
dee266aca0 ignore "no crontab for ..." message
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-18 16:39:13 +02:00
Evax Software
5c70018411 switch the __rvm type to the new present/absent state scheme 2012-05-18 10:55:28 +02:00
Evax Software
196fb7e656 use new rvm install command (fixes #67) 2012-05-18 10:43:39 +02:00
Nico Schottelius
dfd60ca837 __package uses present/absent
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-05-18 10:08:19 +02:00
Chris Lamb
1557630e91 s/specifiend/specified/
Signed-off-by: Chris Lamb <lamby@debian.org>
2012-05-10 16:20:43 +00:00
Jake Guffey
4b11a6172d Fixed variable naming in /etc/fstab.$name
had referenced $jailbase when meaning to reference $jaildir
2012-04-30 17:29:08 -04:00
Jake Guffey
1a20f0087e Merge branch 'master' into __jail 2012-04-27 16:47:14 -04:00
Jake Guffey
14e851341a Implemented Nico's suggestions
Parameterized {jailbase,jaildir}
Replaced all usages of /usr/jail with $jaildir
Explicitly fail if $os isn't FreeBSD
Removed $__type/files/ as it is pointless to have now
Updated man page
2012-04-27 11:45:34 -04:00
Jake Guffey
131889b454 Added jail_${name}_flags variable
To make future work, such as resource limiting (rctl(8)) easier, added
"-n ${name}" to jail_flags for each jail.
2012-04-23 14:39:26 -04:00
Jake Guffey
d39821782d Copy /root to $jailbase/rw/$name/root
Copies /root to ${jailbase}/rw/${name}/root
Adds /root to /etc/fstab.${name}
2012-04-23 13:43:27 -04:00
Jake Guffey
a4c89c5552 Merge branch 'master' into __jail 2012-04-18 13:13:11 -04:00
Jake Guffey
847fc9d8c1 Multiple bugfixes
fixed remote copy command
fixed problem with code-remote when jail_enable wasn't in rc.conf
fixed problem with code-remote when jail_list wasn't in rc.conf
added check to see if /etc/devfs.rules exists before trying to use it
added dependency on __directory/usr/jail
2012-04-11 14:53:28 -04:00
Jake Guffey
f5437ccce6 Bugfix for jail_list
If jail_list wasn't already defined in /etc/rc.conf, gencode-remote wasn't adding the variable to the file.
2012-04-06 13:32:59 -04:00
pestaa
deafcc60e8 Workound lack of pipeline's integrity guarantee. 2012-04-06 18:55:35 +02:00
pestaa
f9c945cc86 Changed tactics. Sed's -i flag is not cross-platform. 2012-04-06 11:15:06 +02:00
pestaa
0e11583b1e Fix sed argumenting on FreeBSD. While specifying -i flag is optional on GNU sed, it is mandatory on non-GNU variants. In order to keep behavior backward-compatible, the backup file is always removed. 2012-04-05 23:21:11 +02:00
Nico Schottelius
0a03a15537 Merge branch '__start_on_boot' of https://github.com/asteven/cdist 2012-04-04 09:47:02 +02:00
Nico Schottelius
a586d6b54b Merge branch '__file_exists' of https://github.com/asteven/cdist 2012-04-04 09:44:14 +02:00
Steven Armstrong
e3f767f5a1 += example
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-04 09:37:18 +02:00
Nico Schottelius
f2a51f1a10 Merge branch '__file_exists' of https://github.com/asteven/cdist 2012-04-04 09:32:08 +02:00
Steven Armstrong
ffcf57ee45 implement --state exists
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-04 00:08:23 +02:00
Jake Guffey
ace13f3582 Merge branch 'master' into __jail 2012-04-03 14:08:18 -04:00
Steven Armstrong
18a25dc65b file must be last argument
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-03 17:53:28 +02:00
Steven Armstrong
386c12f251 nested quotes should not be escaped
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-04-03 17:52:58 +02:00
Nico Schottelius
e540502830 Missing cat in __package_yum
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-04-03 05:59:24 +02:00
Nico Schottelius
f3efa1e74d enable __start_on_boot on amazon linux
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-30 09:14:25 +02:00
Jake Guffey
33cb887acf Merge https://github.com/telmich/cdist 2012-03-12 16:44:25 -04:00
Nico Schottelius
856514d70f Merge remote-tracking branch 'mcodd/groupmod-redhat-exception' 2012-03-12 20:56:57 +01:00
Nico Schottelius
db14277b41 move __mysql_server to types_submitted_for_inclusion
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-12 20:54:41 +01:00
Nico Schottelius
8a6ac230aa Merge remote-tracking branch 'benedikt/type-mysql_server' 2012-03-12 20:52:56 +01:00
Nico Schottelius
73113a2fe9 --whitespace
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-12 20:17:59 +01:00
Nico Schottelius
08ce990207 Merge remote-tracking branch 'benedikt/type-mysql_database' 2012-03-12 20:17:21 +01:00
Steven Armstrong
f3545a51fe be nice with them users
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-03-10 14:08:57 +01:00
Steven Armstrong
10d0cf00d6 /special/raw/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-03-10 14:07:13 +01:00
Steven Armstrong
1ea0ea0b1b add support for crontab EXTENSIONS, e.g. @reboot
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-03-09 20:05:50 +01:00
Jake Guffey
5dc8d305e5 Bugfix
Modified pipeline to determine ${name}'s version if it's installed.
2012-03-05 14:57:37 -05:00
Matt Coddington
38b2e56786 tiny fix for __start_on_boot/explorer/state
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-03-01 08:44:37 +01:00
Jake Guffey
46b916c0e1 Various bugfixes
Added logic to ensure that /etc/resolv.conf exists within a jail
Replaced /var/db, /var/tmp mountpoints with /var mountpoint in jail
Added logic to ensure that every jail is bound to an interface
Modified how information is inserted into the jail's rc.conf
Added ListenAddress directive for SSHd
Updated manpage to reflect these changes
2012-02-28 16:39:08 -05:00
Jake Guffey
20a3538e72 Fixed echoing entries
Entries weren't being properly echoed into /usr/jail/rw/${name}/etc/rc.conf
2012-02-28 11:21:23 -05:00
Jake Guffey
0515fd8483 Various bugfixes.
Needed to use '|| true' on subshell variable assignments in case of empty return
Added default status (started=true or false)
Added default devfs rules
Replaced <<- HEREDOC usage with <<
Added escapes where necessary within quoted strings or HEREDOCs
2012-02-23 17:17:30 -05:00
Jake Guffey
e4a7085978 Merge branch 'master' into __jail 2012-02-22 16:06:54 -05:00
Jake Guffey
3ebda62f04 bugfix -- needed to pass '-r' to ${add_cmd} to retreive package from remote repository. 2012-02-22 12:41:45 -05:00
Jake Guffey
446f497c4c Created deleteJail function. Ready to begin debugging. 2012-02-22 12:13:20 -05:00
Jake Guffey
18c0e947aa Created initial createJail function. Script still can't delete jails yet. 2012-02-21 18:34:21 -05:00
Giel van Schijndel
12d2c6c199 __start_on_boot type: add support for OpenWRT
Signed-off-by: Giel van Schijndel <giel+cdist@mortis.eu>
2012-02-21 22:25:45 +01:00
Jake Guffey
37d72a08ea Merge branch 'master' into __jail 2012-02-21 16:09:19 -05:00
Jake Guffey
b9c757b78a Filled out man page, created gencode-local to copy jailbase to __target_host, filled out parameter list, made explorers useful, created basic layout within gencode-remote. 2012-02-21 15:59:19 -05:00
Nico Schottelius
342d7bc80e Merge remote-tracking branch 'jake/__package_pkg_freebsd'
Conflicts:
	conf/type/__package/manifest

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-02-21 09:58:02 +01:00
Benedikt Koeppel
cd8e286988 renamed --database to --name 2012-02-21 07:03:03 +01:00
Benedikt Koeppel
df512162cb --password is optional now, and added --no_my_cnf option
if no password is specified, then __mysql_server simply installs the
mysql-server package and doesn't perform any additional tasks.
if --password is specified, it writes its own .my.cnf configuration file
with the root password. This behaviour can be turned of by setting
--no_my_cnf "true"
2012-02-21 06:49:47 +01:00
Giel van Schijndel
afdfb660c7 Add support for OpenWRT packages
Signed-off-by: Giel van Schijndel <giel+cdist@mortis.eu>
2012-02-20 21:45:20 +01:00
Jake Guffey
2e4e291449 Added gencode-local to sync jailbase with remote side, added .gitignore to keep from syncing jailbase.tgz with github, new explorer basepresent to look for /usr/jail/{base,jailbase.tgz} 2012-02-20 14:20:55 -05:00
Giel van Schijndel
9538ef6462 Properly detect OpenWRT in global explorers
Signed-off-by: Giel van Schijndel <giel+cdist@mortis.eu>
2012-02-20 18:25:22 +01:00
Jake Guffey
879522db4c Merge branch 'master' into __package_pkg_freebsd 2012-02-20 11:41:08 -05:00
Jake Guffey
5989fedb3e Merge branch 'master' into __jail 2012-02-20 11:40:58 -05:00
Jake Guffey
377afe8b1c Migrated to using present/absent for --state param. 2012-02-20 10:51:18 -05:00
Nico Schottelius
cfb8e7d372 move __run_command to types_submitted_for_inclusion directory
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-02-20 10:22:52 +01:00
Nico Schottelius
be6522c729 Merge remote-tracking branch 'benedikt/type-run_command' 2012-02-20 10:21:17 +01:00
Jake Guffey
d082815c81 Created explorers, man page, jailbase placeholder. Began initial development of gencode-remote. 2012-02-19 14:09:36 -05:00
Benedikt Koeppel
c67c0cf12d fixed mysql_database type
can now install a database, and create a user who manages that database
2012-02-19 08:42:13 +01:00
Benedikt Koeppel
cfaee39e70 new type 'mysql_database'
installs a database on an existing mysql_server remotely
2012-02-19 08:42:12 +01:00
Benedikt Koeppel
6a491080f8 fixed man page for mysql_server
it is a singleton and thus can't have a name
2012-02-19 08:38:33 +01:00
Benedikt Koeppel
7715ba395c fixed mysql_server type
can install now successfully
removes test database and all grants
sets a root password
2012-02-19 08:38:33 +01:00
Benedikt Koeppel
3a810fa5ea fix manifest 2012-02-19 08:38:33 +01:00
Benedikt Koeppel
3ceb643487 fixed the generating of .my.cnf 2012-02-19 08:38:33 +01:00
Benedikt Koeppel
dc5fb8b769 fixed usage of __file 2012-02-19 08:38:32 +01:00
Benedikt Koeppel
01619614d4 splitted manifest up in manifest and gencode-remote 2012-02-19 08:38:32 +01:00
Benedikt Koeppel
b6a0d55c0b fixed title in mysql_server man page 2012-02-19 08:38:32 +01:00
Benedikt Koeppel
ff5c97342b new type "__mysql_server"
installs a MySQL server and performs some basic security changes.
2012-02-19 08:38:32 +01:00
Jake Guffey
d5b015b268 Initial commit. Placeholder files. 2012-02-17 14:13:55 -05:00
Jake Guffey
b7e3378262 Modified __package to allow pkgsite param, bugfix in __package_pkg_freebsd where it wasn't setting the PACKAGESITE variable on remote side. 2012-02-17 12:18:06 -05:00
Jake Guffey
5443d1a64a Modified __package to utilize __package_pkg_freebsd 2012-02-17 11:35:59 -05:00
Jake Guffey
1d5b7cef9c Moved __package_pkg_freebsd to separate branch 2012-02-17 11:35:31 -05:00
Jake Guffey
ffec26d462 Removed __package_pkg_freebsd customization
from __package type for inclusion in a separate branch.
2012-02-17 11:30:21 -05:00
Jake Guffey
ff5d0fd7fc Removed newly-developed types for inclusion
in separate branches.
2012-02-17 11:29:12 -05:00
Nico Schottelius
0f649577ad update __process to new style, warn if not present/absent
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-02-17 12:10:42 +01:00
Nico Schottelius
e0f80f0103 include object_name in warning
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-02-17 11:54:34 +01:00