diff --git a/usr/local/etc/bastille/bastille.conf.sample b/usr/local/etc/bastille/bastille.conf.sample index 9c55649d..e91b589e 100644 --- a/usr/local/etc/bastille/bastille.conf.sample +++ b/usr/local/etc/bastille/bastille.conf.sample @@ -3,16 +3,16 @@ ##################### ## default paths -bastille_prefix=/usr/local/bastille ## default: "/usr/local/bastille" -bastille_backupsdir=${bastille_prefix}/backups ## default: ${bastille_prefix}/backups -bastille_cachedir=${bastille_prefix}/cache ## default: ${bastille_prefix}/cache -bastille_jailsdir=${bastille_prefix}/jails ## default: ${bastille_prefix}/jails -bastille_logsdir=${bastille_prefix}/logs ## default: ${bastille_prefix}/logs -bastille_releasesdir=${bastille_prefix}/releases ## default: ${bastille_prefix}/releases -bastille_templatesdir=${bastille_prefix}/templates ## default: ${bastille_prefix}/templates +bastille_prefix="/usr/local/bastille" ## default: "/usr/local/bastille" +bastille_backupsdir="${bastille_prefix}/backups" ## default: ${bastille_prefix}/backups +bastille_cachedir="${bastille_prefix}/cache" ## default: ${bastille_prefix}/cache +bastille_jailsdir="${bastille_prefix}/jails" ## default: ${bastille_prefix}/jails +bastille_logsdir="${bastille_prefix}/logs" ## default: ${bastille_prefix}/logs +bastille_releasesdir="${bastille_prefix}/releases" ## default: ${bastille_prefix}/releases +bastille_templatesdir="${bastille_prefix}/templates" ## default: ${bastille_prefix}/templates ## bastille scripts directory (assumed by bastille pkg) -bastille_sharedir=/usr/local/share/bastille ## default: "/usr/local/share/bastille" +bastille_sharedir="/usr/local/share/bastille" ## default: "/usr/local/share/bastille" ## bootstrap archives (base, lib32, ports, src, test) bastille_bootstrap_archives="base" ## default: "base" diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index fd955874..f5afb904 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -325,14 +325,20 @@ create_jail() { fi ## rc.conf - ## + syslogd_flags="-ss" - ## + sendmail_none="NONE" - ## + cron_flags="-J 60" ## cedwards 20181118 + ## + syslogd_flags="-ss" + ## + sendmail_enable="NO" + ## + sendmail_submit_enable="NO" + ## + sendmail_outbound_enable="NO" + ## + sendmail_msp_queue_enable="NO" + ## + cron_flags="-J 60" ## cedwards 20181118 if [ ! -f "${bastille_jail_rc_conf}" ]; then touch "${bastille_jail_rc_conf}" - sysrc -f "${bastille_jail_rc_conf}" syslogd_flags=-ss - sysrc -f "${bastille_jail_rc_conf}" sendmail_enable=NONE - sysrc -f "${bastille_jail_rc_conf}" cron_flags='-J 60' + sysrc -f "${bastille_jail_rc_conf}" syslogd_flags="-ss" + sysrc -f "${bastille_jail_rc_conf}" sendmail_enable="NO" + sysrc -f "${bastille_jail_rc_conf}" sendmail_submit_enable="NO" + sysrc -f "${bastille_jail_rc_conf}" sendmail_outbound_enable="NO" + sysrc -f "${bastille_jail_rc_conf}" sendmail_msp_queue_enable="NO" + sysrc -f "${bastille_jail_rc_conf}" cron_flags="-J 60" ## VNET specific if [ -n "${VNET_JAIL}" ]; then