Changeset 12334 in hybrid for branches/releng-9/nanobsd/files/etc


Ignore:
Timestamp:
May 28, 2013, 8:43:18 PM (12 years ago)
Author:
rick
Message:

Make sure iperf daemon is started by default.

Location:
branches/releng-9/nanobsd/files/etc
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/releng-9/nanobsd/files/etc/rc.conf

    r10776 r12334  
    6868snmpd_flags="-Ls 1"
    6969
     70# Performance profiling
     71iperf_enable="YES"
     72
    7073# HTTP(S) proxy server
    7174tinyproxy_enable="NO"
  • branches/releng-9/nanobsd/files/etc/rc.d/iperf

    r12329 r12334  
    11#!/bin/sh
    22#
    3 # $FreeBSD: release/9.0.0/etc/rc.d/named 220962 2011-04-23 04:26:31Z dougb $
     3# PROVIDE: iperf
     4# BEFORE: DAEMON
     5# KEYWORD: shutdown
    46#
    5 
    6 # PROVIDE: named
    7 # REQUIRE: SERVERS cleanvar
    8 # KEYWORD: shutdown
    9 
     7# Add the following line to /etc/rc.conf to enable iperf in server mode:
     8#
     9# iperf_enable="YES"
     10#
    1011. /etc/rc.subr
    1112
    12 name="named"
    13 rcvar=named_enable
     13name=iperf
     14rcvar=`set_rcvar`
    1415
    15 extra_commands="reload"
     16#command=/usr/local/bin/iperf
     17#command_args="-s -D"
    1618
    17 start_precmd="named_prestart"
    18 start_postcmd="named_poststart"
    19 reload_cmd="named_reload"
    20 stop_cmd="named_stop"
    21 stop_postcmd="named_poststop"
     19load_rc_config ${name}
    2220
    23 # If running in a chroot cage, ensure that the appropriate files
    24 # exist inside the cage, as well as helper symlinks into the cage
    25 # from outside.
    26 #
    27 # As this is called after the is_running and required_dir checks
    28 # are made in run_rc_command(), we can safely assume ${named_chrootdir}
    29 # exists and named isn't running at this point (unless forcestart
    30 # is used).
    31 #
    32 chroot_autoupdate()
    33 {
    34         local file
     21iperf_enable=${iperf_enable-"NO"}
    3522
    36         # Create (or update) the chroot directory structure
    37         #
    38         if [ -r /etc/mtree/BIND.chroot.dist ]; then
    39                 mtree -deU -f /etc/mtree/BIND.chroot.dist \
    40                     -p ${named_chrootdir}
    41         else
    42                 warn "/etc/mtree/BIND.chroot.dist missing,"
    43                 warn "chroot directory structure not updated"
    44         fi
     23####
     24# iperf does not generate a pid file
     25# iperf_pidfile=${iperf_pidfile-"/var/run/.pid"}
     26# pidfile="${iperf_pidfile}"
    4527
    46         # Create (or update) the configuration directory symlink
    47         #
    48         if [ ! -L "${named_conf%/*}" ]; then
    49                 if [ -d "${named_conf%/*}" ]; then
    50                         warn "named chroot: ${named_conf%/*} is a directory!"
    51                 elif [ -e "${named_conf%/*}" ]; then
    52                         warn "named chroot: ${named_conf%/*} exists!"
    53                 else
    54                         ln -s ${named_confdir} ${named_conf%/*}
    55                 fi
    56         else
    57                 # Make sure it points to the right place.
    58                 ln -shf ${named_confdir} ${named_conf%/*}
    59         fi
    60 
    61         # Mount a devfs in the chroot directory if needed
    62         #
    63         if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
    64                 umount ${named_chrootdir}/dev 2>/dev/null
    65                 devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
    66                 devfs -m ${named_chrootdir}/dev rule apply path null unhide
    67                 devfs -m ${named_chrootdir}/dev rule apply path random unhide
    68         else
    69                 if [ -c ${named_chrootdir}/dev/null -a \
    70                     -c ${named_chrootdir}/dev/random ]; then
    71                         info "named chroot: using pre-mounted devfs."
    72                 else
    73                         err 1 "named chroot: devfs cannot be mounted from" \
    74                             "within a jail. Thus a chrooted named cannot" \
    75                             "be run from within a jail." \
    76                             "To run named without chrooting it, set" \
    77                             "named_chrootdir=\"\" in /etc/rc.conf."
    78                 fi
    79         fi
    80 
    81         # Copy and/or update key files to the chroot /etc
    82         #
    83         for file in localtime protocols services; do
    84                 if [ -r /etc/$file ]; then
    85                         cmp -s /etc/$file "${named_chrootdir}/etc/$file" ||
    86                             cp -p /etc/$file "${named_chrootdir}/etc/$file"
    87                 fi
    88         done
    89 }
    90 
    91 # Make symlinks to the correct pid file
    92 #
    93 make_symlinks()
    94 {
    95         checkyesno named_symlink_enable &&
    96             ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
    97 }
    98 
    99 named_poststart () {
    100         make_symlinks
    101 
    102         if checkyesno named_wait; then
    103                 until ${command%/sbin/named}/bin/host $named_wait_host >/dev/null 2>&1; do
    104                         echo "  Waiting for nameserver to resolve $named_wait_host"
    105                         sleep 1
    106                 done
    107         fi
    108 }
    109 
    110 named_reload()
    111 {
    112         ${command%/named}/rndc reload
    113 }
    114 
    115 find_pidfile()
    116 {
    117         if get_pidfile_from_conf pid-file $named_conf; then
    118                 pidfile="$_pidfile_from_conf"
    119         else
    120                 pidfile="/var/run/named/pid"
    121         fi
    122 }
    123 
    124 named_stop()
    125 {
    126         find_pidfile
    127 
    128         # This duplicates an undesirably large amount of code from the stop
    129         # routine in rc.subr in order to use rndc to shut down the process,
    130         # and to give it a second chance in case rndc fails.
    131         rc_pid=$(check_pidfile $pidfile $command)
    132         if [ -z "$rc_pid" ]; then
    133                 [ -n "$rc_fast" ] && return 0
    134                 _run_rc_notrunning
    135                 return 1
    136         fi
    137         echo 'Stopping named.'
    138         if ${command%/named}/rndc stop 2>/dev/null; then
    139                 wait_for_pids $rc_pid
    140         else
    141                 echo -n 'rndc failed, trying kill: '
    142                 kill -TERM $rc_pid
    143                 wait_for_pids $rc_pid
    144         fi
    145 }
    146 
    147 named_poststop()
    148 {
    149         if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then
    150                 if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
    151                         umount ${named_chrootdir}/dev 2>/dev/null || true
    152                 else
    153                         warn "named chroot:" \
    154                             "cannot unmount devfs from inside jail!"
    155                 fi
    156         fi
    157 }
    158 
    159 create_file () {
    160         if [ -e "$1" ]; then
    161                 unlink $1
    162         fi
    163         > $1
    164         chown root:wheel $1
    165         chmod 644 $1
    166 }
    167 
    168 named_prestart()
    169 {
    170         find_pidfile
    171 
    172         if [ -n "$named_pidfile" ]; then
    173                 warn 'named_pidfile: now determined from the conf file'
    174         fi
    175 
    176         command_args="-u ${named_uid:=root}"
    177 
    178         if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
    179                 case "$named_flags" in
    180                 -c*|*' -c'*) ;;         # No need to add it
    181                 *) command_args="-c $named_conf $command_args" ;;
    182                 esac
    183         fi
    184 
    185         local line nsip firstns
    186 
    187         # Is the user using a sandbox?
    188         #
    189         if [ -n "$named_chrootdir" ]; then
    190                 rc_flags="$rc_flags -t $named_chrootdir"
    191                 checkyesno named_chroot_autoupdate && chroot_autoupdate
    192         else
    193                 named_symlink_enable=NO
    194         fi
    195 
    196         # Create an rndc.key file for the user if none exists
    197         #
    198         confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
    199             -c ${named_confdir}/rndc.key"
    200         if [ -s "${named_confdir}/rndc.conf" ]; then
    201                 unset confgen_command
    202         fi
    203         if [ -s "${named_confdir}/rndc.key" ]; then
    204                 case `stat -f%Su ${named_confdir}/rndc.key` in
    205                 root|$named_uid) ;;
    206                 *) $confgen_command ;;
    207                 esac
    208         else
    209                 $confgen_command
    210         fi
    211 
    212         local checkconf
    213 
    214         checkconf="${command%/named}/named-checkconf"
    215         if ! checkyesno named_chroot_autoupdate && [ -n "$named_chrootdir" ]; then
    216                 checkconf="$checkconf -t $named_chrootdir"
    217         fi
    218 
    219         # Create a forwarder configuration based on /etc/resolv.conf
    220         if checkyesno named_auto_forward; then
    221                 if [ ! -s /etc/resolv.conf ]; then
    222                         warn "named_auto_forward enabled, but no /etc/resolv.conf"
    223 
    224                         # Empty the file in case it is included in named.conf
    225                         [ -s "${named_confdir}/auto_forward.conf" ] &&
    226                             create_file ${named_confdir}/auto_forward.conf
    227 
    228                         $checkconf $named_conf ||
    229                             err 3 'named-checkconf for $named_conf failed'
    230                         return
    231                 fi
    232 
    233                 create_file /var/run/naf-resolv.conf
    234                 create_file /var/run/auto_forward.conf
    235 
    236                 echo '  forwarders {' > /var/run/auto_forward.conf
    237 
    238                 while read line; do
    239                         case "$line" in
    240                         'nameserver '*|'nameserver      '*)
    241                                 # Make sure to strip the optional trailing comment
    242                                 line=${line%%#*}
    243                                 nsip=${line##nameserver[         ]}
    244 
    245                                 if [ -z "$firstns" ]; then
    246                                         if [ ! "$nsip" = '127.0.0.1' ]; then
    247                                                 echo 'nameserver 127.0.0.1'
    248                                                 echo "          ${nsip};" >> /var/run/auto_forward.conf
    249                                         fi
    250 
    251                                         firstns=1
    252                                 else
    253                                         [ "$nsip" = '127.0.0.1' ] && continue
    254                                         echo "          ${nsip};" >> /var/run/auto_forward.conf
    255                                 fi
    256                                 ;;
    257                         esac
    258 
    259                         echo $line
    260                 done < /etc/resolv.conf > /var/run/naf-resolv.conf
    261 
    262                 echo '  };' >> /var/run/auto_forward.conf
    263                 echo '' >> /var/run/auto_forward.conf
    264                 if checkyesno named_auto_forward_only; then
    265                         echo "  forward only;" >> /var/run/auto_forward.conf
    266                 else
    267                         echo "  forward first;" >> /var/run/auto_forward.conf
    268                 fi
    269 
    270                 if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then
    271                         unlink /var/run/naf-resolv.conf
    272                 else
    273                         [ -e /etc/resolv.conf ] && unlink /etc/resolv.conf
    274                         mv /var/run/naf-resolv.conf /etc/resolv.conf
    275                 fi
    276 
    277                 if cmp -s ${named_confdir}/auto_forward.conf \
    278                     /var/run/auto_forward.conf; then
    279                         unlink /var/run/auto_forward.conf
    280                 else
    281                         [ -e "${named_confdir}/auto_forward.conf" ] &&
    282                             unlink ${named_confdir}/auto_forward.conf
    283                         mv /var/run/auto_forward.conf \
    284                             ${named_confdir}/auto_forward.conf
    285                 fi
    286         else
    287                 # Empty the file in case it is included in named.conf
    288                 [ -s "${named_confdir}/auto_forward.conf" ] &&
    289                     create_file ${named_confdir}/auto_forward.conf
    290         fi
    291 
    292         $checkconf $named_conf || err 3 'named-checkconf for $named_conf failed'
    293 }
    294 
    295 load_rc_config $name
    296 
    297 # Updating the following variables requires that rc.conf be loaded first
    298 #
    299 required_dirs="$named_chrootdir"        # if it is set, it must exist
    300 
    301 named_confdir="${named_chrootdir}${named_conf%/*}"
     28# Quick to start iperf in deamon mode and make sure logfiles get writting in
     29# parseable way
     30start_cmd="sh -c 'iperf -s -D -y c 1>>/var/log/iperf.log 2>>/var/log/iperf.log'"
    30231
    30332run_rc_command "$1"
Note: See TracChangeset for help on using the changeset viewer.