diff options
author | dougb <dougb@FreeBSD.org> | 2009-07-16 00:56:10 +0800 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2009-07-16 00:56:10 +0800 |
commit | 494e64d35476b3d777e09b5c75c7f56d18f6f1a4 (patch) | |
tree | c74b2ceb9536b8f2ceb137209a5ae5643148edde /security | |
parent | 5df5244832441b2891d52b6e4692f7826550fbf9 (diff) | |
download | freebsd-ports-gnome-494e64d35476b3d777e09b5c75c7f56d18f6f1a4.tar.gz freebsd-ports-gnome-494e64d35476b3d777e09b5c75c7f56d18f6f1a4.tar.zst freebsd-ports-gnome-494e64d35476b3d777e09b5c75c7f56d18f6f1a4.zip |
Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.
1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).
No PORTREVISION bumps because all of these changes are noops.
Diffstat (limited to 'security')
23 files changed, 47 insertions, 80 deletions
diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.sh.in index a0cfeeeccd35..d5be3ef19d62 100644 --- a/security/amavisd-milter/files/amavisd-milter.sh.in +++ b/security/amavisd-milter/files/amavisd-milter.sh.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable amavisd-milter: # -#amavisd_milter_enable="YES" +# amavisd_milter_enable="YES" +# amavisd_milter_flags="<set as needed>" # . %%RC_SUBR%% @@ -23,7 +24,6 @@ load_rc_config $name # Set defaults : ${amavisd_milter_enable:="NO"} -: ${amavisd_milter_flags=""} : ${amavisd_milter_user="%%AMAVISUSER%%"} pidfile="${amavisd_milter_pidfile:-%%AMAVISDIR%%/amavisd-milter.pid}" diff --git a/security/clamav-devel/files/clamav-clamd.in b/security/clamav-devel/files/clamav-clamd.in index 4d292e61578d..3aded5ca811b 100644 --- a/security/clamav-devel/files/clamav-clamd.in +++ b/security/clamav-devel/files/clamav-clamd.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable clamd: # -#clamav_clamd_enable="YES" +# clamav_clamd_enable="YES" +# clamav_clamd_flags="<set as needed>" # # See clamd(8) for flags # @@ -28,7 +29,6 @@ required_files=%%PREFIX%%/etc/clamd.conf # read settings, set default values load_rc_config "$name" : ${clamav_clamd_enable="NO"} -: ${clamav_clamd_flags=""} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} start_precmd=clamav_clamd_precmd diff --git a/security/clamav-devel/files/clamav-freshclam.in b/security/clamav-devel/files/clamav-freshclam.in index 77a6053c2e87..4721d2e60ed9 100644 --- a/security/clamav-devel/files/clamav-freshclam.in +++ b/security/clamav-devel/files/clamav-freshclam.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable the freshclam daemon: # -#clamav_freshclam_enable="YES" +# clamav_freshclam_enable="YES" +# clamav_freshclam_flags="<set as needed>" # # See freshclam(1) for flags # @@ -30,6 +31,5 @@ required_files=%%PREFIX%%/etc/freshclam.conf # read settings, set default values load_rc_config "$name" : ${clamav_freshclam_enable="NO"} -: ${clamav_freshclam_flags=""} run_rc_command "$1" diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav-clamd.in index a5194e8e26f3..0bc40b5fc874 100644 --- a/security/clamav/files/clamav-clamd.in +++ b/security/clamav/files/clamav-clamd.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable clamd: # -#clamav_clamd_enable="YES" +# clamav_clamd_enable="YES" +# clamav_clamd_flags="<set as needed>" # # See clamd(8) for flags # @@ -28,7 +29,6 @@ required_files=%%PREFIX%%/etc/clamd.conf # read settings, set default values load_rc_config "$name" : ${clamav_clamd_enable="NO"} -: ${clamav_clamd_flags=""} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} start_precmd=clamav_clamd_precmd diff --git a/security/clamav/files/clamav-freshclam.in b/security/clamav/files/clamav-freshclam.in index 77a6053c2e87..4721d2e60ed9 100644 --- a/security/clamav/files/clamav-freshclam.in +++ b/security/clamav/files/clamav-freshclam.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable the freshclam daemon: # -#clamav_freshclam_enable="YES" +# clamav_freshclam_enable="YES" +# clamav_freshclam_flags="<set as needed>" # # See freshclam(1) for flags # @@ -30,6 +31,5 @@ required_files=%%PREFIX%%/etc/freshclam.conf # read settings, set default values load_rc_config "$name" : ${clamav_freshclam_enable="NO"} -: ${clamav_freshclam_flags=""} run_rc_command "$1" diff --git a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in index 56170d27d1eb..892795cb6eb9 100644 --- a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in +++ b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: mail imap # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move saslauthd.sh to /etc/rc.d/saslauthd - -prefix=%%PREFIX%% # Define these saslauthd_* variables in one of these files: # /etc/rc.conf @@ -24,13 +18,13 @@ prefix=%%PREFIX%% saslauthd_enable=${saslauthd_enable:-"NO"} # Enable saslauthd saslauthd_flags=${saslauthd_flags:-"-a pam"} # Flags to saslauthd program #saslauthd_runpath="%%SASLAUTHD_RUNPATH%%" # Working directory -#saslauthd_program="${prefix}/sbin/saslauthd" # Location of saslauthd +#saslauthd_program="%%PREFIX%%/sbin/saslauthd" # Location of saslauthd . %%RC_SUBR%% name="saslauthd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" load_rc_config $name diff --git a/security/distcache-devel/files/dc_server.sh.in b/security/distcache-devel/files/dc_server.sh.in index 386685537931..ac3caa9147a6 100644 --- a/security/distcache-devel/files/dc_server.sh.in +++ b/security/distcache-devel/files/dc_server.sh.in @@ -10,7 +10,8 @@ # Add the following line to /etc/rc.conf to enable `%%NAME%%': # -#%%NAME%%_enable="YES" +# %%NAME%%_enable="YES" +# %%NAME%%_flags="<set as needed>" # # See %%NAME%%(1) # @@ -27,6 +28,5 @@ pidfile="/var/run/$name.pid" # read configuration and set defaults load_rc_config "$name" : ${%%NAME%%_enable="NO"} -: ${%%NAME%%_flags=""} run_rc_command "$1" diff --git a/security/distcache/files/dc_server.sh.in b/security/distcache/files/dc_server.sh.in index 386685537931..ac3caa9147a6 100644 --- a/security/distcache/files/dc_server.sh.in +++ b/security/distcache/files/dc_server.sh.in @@ -10,7 +10,8 @@ # Add the following line to /etc/rc.conf to enable `%%NAME%%': # -#%%NAME%%_enable="YES" +# %%NAME%%_enable="YES" +# %%NAME%%_flags="<set as needed>" # # See %%NAME%%(1) # @@ -27,6 +28,5 @@ pidfile="/var/run/$name.pid" # read configuration and set defaults load_rc_config "$name" : ${%%NAME%%_enable="NO"} -: ${%%NAME%%_flags=""} run_rc_command "$1" diff --git a/security/expiretable/files/expiretable.in b/security/expiretable/files/expiretable.in index 8f10aa4711a3..ad5ee98139fd 100644 --- a/security/expiretable/files/expiretable.in +++ b/security/expiretable/files/expiretable.in @@ -16,6 +16,5 @@ command="/usr/local/sbin/expiretable" load_rc_config "$name" expiretable_enable=${expiretable_enable-"NO"} -expiretable_flags=${expiretable_flags-""} run_rc_command "$1" diff --git a/security/f-protd/files/fprotd.sh.in b/security/f-protd/files/fprotd.sh.in index 5d8d3957ee4b..9d0c306a81b6 100644 --- a/security/f-protd/files/fprotd.sh.in +++ b/security/f-protd/files/fprotd.sh.in @@ -11,14 +11,12 @@ # fprotd_enable="YES" # -prefix=%%PREFIX%% - . /etc/rc.subr name=fprotd rcvar=`set_rcvar` start_precmd="fprotd_precmd" -command="${prefix}/f-prot/f-protd" +command="%%PREFIX%%/f-prot/f-protd" command_args="> /dev/null 2>&1" required_files="/etc/f-prot.conf" @@ -26,7 +24,7 @@ required_files="/etc/f-prot.conf" load_rc_config ${name} : ${fprotd_enable=NO} -: ${fprotd_virus_defs=${prefix}/f-prot} +: ${fprotd_virus_defs=%%PREFIX%%/f-prot} fprotd_precmd() { diff --git a/security/f-protd/files/fprotd_scanmail.sh.in b/security/f-protd/files/fprotd_scanmail.sh.in index dc9fc183b711..887aaffef574 100644 --- a/security/f-protd/files/fprotd_scanmail.sh.in +++ b/security/f-protd/files/fprotd_scanmail.sh.in @@ -11,14 +11,12 @@ # fprotd_scanmail_enable="YES" # -prefix=%%PREFIX%% - . /etc/rc.subr name=fprotd_scanmail rcvar=`set_rcvar` pidfile="/var/run/scanmail.pid" -command="${prefix}/f-prot/tools/scan-mail.pl" +command="%%PREFIX%%/f-prot/tools/scan-mail.pl" command_args="> /dev/null 2>&1" command_interpreter="/usr/bin/perl" diff --git a/security/ipsec-tools/files/racoon.sh.in b/security/ipsec-tools/files/racoon.sh.in index 8bbe2e826c6f..387342453394 100644 --- a/security/ipsec-tools/files/racoon.sh.in +++ b/security/ipsec-tools/files/racoon.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move racoon.sh to /etc/rc.d/racoon - -prefix=%%PREFIX%% # Define these racoon_* variables in one of these files: # /etc/rc.conf @@ -22,7 +16,6 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$racoon_enable" ] && racoon_enable="NO" # Disable by default -#racoon_program="${prefix}/sbin/racoon" # Location of racoon #racoon_flags="" # Flags to racoon program racoon_create_dirs=NO # Create $required_dirs (for # /var mfs)? @@ -31,10 +24,10 @@ racoon_create_dirs=NO # Create $required_dirs (for name="racoon" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" socketfile="%%STATEDIR%%/${name}.sock" -required_files="${prefix}/etc/${name}/${name}.conf" +required_files="%%PREFIX%%/etc/${name}/${name}.conf" required_dirs="%%STATEDIR%%" start_precmd="racoon_cleanup" stop_postcmd="racoon_cleanup" diff --git a/security/nessus/files/nessusd.sh.in b/security/nessus/files/nessusd.sh.in index 63352c04c38d..0dc28842a5ac 100644 --- a/security/nessus/files/nessusd.sh.in +++ b/security/nessus/files/nessusd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move nessusd.sh to /etc/rc.d/nessusd - -prefix=%%PREFIX%% # Define these nessusd_* variables in one of these files: # /etc/rc.conf @@ -22,22 +16,22 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$nessusd_enable" ] && nessusd_enable="NO" # Disable nessusd -#nessusd_program="${prefix}/sbin/nessusd" # Location of nessusd +#nessusd_program="%%PREFIX%%/sbin/nessusd" # Location of nessusd nessusd_flags="-D" # Flags to nessusd program . %%RC_SUBR%% name="nessusd" rcvar=`set_rcvar` -command="${prefix}/sbin/nessusd" -pidfile="${prefix}/var/nessus/nessusd.pid" -required_files="${prefix}/etc/nessus/nessusd.conf" +command="%%PREFIX%%/sbin/nessusd" +pidfile="%%PREFIX%%/var/nessus/nessusd.pid" +required_files="%%PREFIX%%/etc/nessus/nessusd.conf" start_precmd="nessus_check_certificate" nessus_check_certificate() { - if [ ! -f ${prefix}/var/CA/serverkey.pem ]; then - ${prefix}/sbin/nessus-mkcert + if [ ! -f %%PREFIX%%/var/CA/serverkey.pem ]; then + %%PREFIX%%/sbin/nessus-mkcert fi } diff --git a/security/oidentd/files/oidentd.in b/security/oidentd/files/oidentd.in index ac8e5cb0f1a9..5dede140ea43 100644 --- a/security/oidentd/files/oidentd.in +++ b/security/oidentd/files/oidentd.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable oidentd: # -#oidentd_enable="YES" +# oidentd_enable="YES" +# oidentd_flags="<set as needed>" # # See oidentd(8) for flags. # @@ -26,7 +27,6 @@ command=%%PREFIX%%/sbin/${name} oidentd_enable=${oidentd_enable:-"NO"} oidentd_conf=${oidentd_conf:-"%%PREFIX%%/etc/${name}.conf"} -oidentd_flags=${oidentd_flags:-""} oidentd_precmd () { diff --git a/security/openvas-server/files/openvasd.in b/security/openvas-server/files/openvasd.in index ab5db47cf775..f3773c741b1b 100644 --- a/security/openvas-server/files/openvasd.in +++ b/security/openvas-server/files/openvasd.in @@ -9,8 +9,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these openvasd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -19,16 +17,16 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$openvasd_enable" ] && openvasd_enable="NO" # Disable openvasd -#openvasd_program="${prefix}/sbin/openvasd" # Location of openvasd +#openvasd_program="%%PREFIX%%/sbin/openvasd" # Location of openvasd openvasd_flags="-D -q" # Flags to openvasd program . %%RC_SUBR%% name="openvasd" rcvar=`set_rcvar` -command="${prefix}/sbin/openvasd" +command="%%PREFIX%%/sbin/openvasd" pidfile="/var/run/openvasd.pid" -required_files="${prefix}/etc/openvas/openvasd.conf" +required_files="%%PREFIX%%/etc/openvas/openvasd.conf" load_rc_config $name run_rc_command "$1" diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in index 84da0a29b940..ca66486c06ab 100644 --- a/security/openvpn-devel/files/openvpn.sh.in +++ b/security/openvpn-devel/files/openvpn.sh.in @@ -75,8 +75,6 @@ esac rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - openvpn_precmd() { for i in $interfaces ; do @@ -118,8 +116,8 @@ load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" +eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" +eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" configfile="$(eval echo \${${name}_configfile})" dir="$(eval echo \${${name}_dir})" diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in index 84da0a29b940..ca66486c06ab 100644 --- a/security/openvpn/files/openvpn.sh.in +++ b/security/openvpn/files/openvpn.sh.in @@ -75,8 +75,6 @@ esac rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - openvpn_precmd() { for i in $interfaces ; do @@ -118,8 +116,8 @@ load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" +eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" +eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" configfile="$(eval echo \${${name}_configfile})" dir="$(eval echo \${${name}_dir})" diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in index 84da0a29b940..ca66486c06ab 100644 --- a/security/openvpn20/files/openvpn.sh.in +++ b/security/openvpn20/files/openvpn.sh.in @@ -75,8 +75,6 @@ esac rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - openvpn_precmd() { for i in $interfaces ; do @@ -118,8 +116,8 @@ load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" +eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" +eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" configfile="$(eval echo \${${name}_configfile})" dir="$(eval echo \${${name}_dir})" diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.sh.in index ce34bcabb088..e168d5389f54 100644 --- a/security/p5-openxpki-deployment/files/openxpki.sh.in +++ b/security/p5-openxpki-deployment/files/openxpki.sh.in @@ -13,7 +13,7 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # openxpki_enable="${openxpki_enable-NO}" -openxpki_flags="" +# openxpki_flags="" openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid" case "$1" in diff --git a/security/py-fail2ban/files/fail2ban.in b/security/py-fail2ban/files/fail2ban.in index 15ccb1f04463..6573a90eb2c6 100644 --- a/security/py-fail2ban/files/fail2ban.in +++ b/security/py-fail2ban/files/fail2ban.in @@ -4,8 +4,11 @@ # REQUIRE: DAEMON # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable fail2ban: +# fail2ban_enable="YES" +# fail2ban_flags="<set as needed>" + fail2ban_enable=${fail2ban_enable-"NO"} -fail2ban_flags=${fail2ban_flags-""} fail2ban_pidfile=${fail2ban_pidfile-"/var/run/fail2ban/fail2ban.pid"} . %%RC_SUBR%% diff --git a/security/scanlogd/files/scanlogd.sh b/security/scanlogd/files/scanlogd.sh index ef14beba888b..532249fcfcb3 100644 --- a/security/scanlogd/files/scanlogd.sh +++ b/security/scanlogd/files/scanlogd.sh @@ -7,19 +7,18 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -prefix=%%PREFIX%% +# Add the following lines to /etc/rc.conf to enable scanlogd: +# scanlogd_enable="YES" +# scanlogd_flags="<set as needed>" scanlogd_enable=${scanlogd_enable:-"NO"} # Enable scanlogd -scanlogd_program="${prefix}/bin/scanlogd" # Location of scanlogd -scanlogd_flags=${scanlogd_flags:-""} # Flags to scanlogd . %%RC_SUBR%% name="scanlogd" rcvar=`set_rcvar` -command="${prefix}/bin/${name}" +command="%%PREFIX%%/bin/${name}" required_files="" load_rc_config $name diff --git a/security/snortsam/files/snortsam.sh.in b/security/snortsam/files/snortsam.sh.in index 3f15c079042f..946e951f153a 100644 --- a/security/snortsam/files/snortsam.sh.in +++ b/security/snortsam/files/snortsam.sh.in @@ -26,8 +26,6 @@ load_rc_config $name [ -z "$snortsam_enable" ] && snortsam_enable="NO" [ -z "$snortsam_conf" ] && snortsam_conf="%%PREFIX%%/etc/snortsam/snortsam.conf" -[ -z "$snortsam_flags" ] && snortsam_flags="" - [ -n "$snortsam_conf" ] && snortsam_flags="$snortsam_flags $snortsam_conf" run_rc_command "$1" diff --git a/security/sshblock/files/sshblock.in b/security/sshblock/files/sshblock.in index d3d8cb7ae222..4e83ebca00e8 100644 --- a/security/sshblock/files/sshblock.in +++ b/security/sshblock/files/sshblock.in @@ -22,6 +22,5 @@ command="%%PREFIX%%/sbin/sshblock" load_rc_config $name : ${sshblock_enable="NO"} -: ${sshblock_flags=""} run_rc_command "$1" |