X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/1a8b03f30d8fe8ecb5ee86e76f052c53afffe3f3..4cbafe13fc8079df21add06fd7820c7e244cf8fd:/scripts/setup.in diff --git a/scripts/setup.in b/scripts/setup.in index bf47f24..8c8b3b0 100755 --- a/scripts/setup.in +++ b/scripts/setup.in @@ -21,6 +21,79 @@ set -e +while [ $# -gt 0 ]; do + opt="$1" + shift + case "$opt" in + -h | --help ) + cat <&2 "ERROR: unknown option '$opt'" + exit 1 + ;; + esac +done + echo echo ------------------------------------------------------------------------ echo "DisOrder setup script" @@ -71,22 +144,24 @@ echo echo "If this is not what you want, press ^C." echo ------------------------------------------------------------------------ -while :; do - echo - echo "What directory or directories contain your music files:" - echo "(enter one or more directories separated by spaces)" - read -r roots - ok=true - for root in $roots; do - if [ ! -d $root ]; then - echo "'$root' does not exist" - ok=false +if [ -z "$roots" ]; then + while :; do + echo + echo "What directory or directories contain your music files:" + echo "(enter one or more directories separated by spaces)" + read -r roots + ok=true + for root in $roots; do + if [ ! -d $root ]; then + echo "'$root' does not exist" + ok=false + fi + done + if $ok; then + break fi done - if $ok; then - break - fi -done +fi if [ -z "$encoding" ]; then echo @@ -95,42 +170,101 @@ if [ -z "$encoding" ]; then read -r encoding fi -while :; do - echo - echo "What TCP port should DisOrder listen on?" - echo "(enter 'none' for none)" - read -r port - case $port in - none ) - break - ;; - [^0-9] ) - echo "'$port' is not a valid port number" - continue - ;; - * ) - break - ;; - esac -done +if [ -z "$port" ]; then + while :; do + echo + echo "What TCP port should DisOrder listen on?" + echo "(enter 'none' for none)" + read -r port + case $port in + none ) + break + ;; + [^0-9] ) + echo "'$port' is not a valid port number" + continue + ;; + * ) + break + ;; + esac + done +fi -echo -echo "What host should DisOrder use as an SMTP server?" -read -r smtp_server +if [ -z "$play" ]; then + while :; do + echo + echo "How do you want to play sound? Enter 'local' to use a local sound" + echo "device or 'network' to multicast sound across your network." + read -r play + case $play in + 'local' | network ) + break + ;; + * ) + echo "Enter 'local' or 'network'" + continue + ;; + esac + done +fi -while :; do - echo - echo "What address should mail from DisOrder come from?" - read -r mail_sender - case "$mail_sender" in - *@* ) - break - ;; - * ) - echo "Email address must contain an '@' sign" - ;; - esac -done +if [ "x$play" = xnetwork ]; then + if [ -z "$mcast_address" ]; then + echo + echo "Enter destination address for network transmission" + echo "(e.g. a multicast address)" + read -r mcast_address + fi + if [ -z "$mcast_port" ]; then + while :; do + echo + echo "Enter destination port for network transmission" + read -r mcast_port + case $mcast_port in + none ) + break + ;; + [^0-9] ) + echo "'$mcast_port' is not a valid port number" + continue + ;; + * ) + break + ;; + esac + done + fi +fi + +if [ -z "$mail_sender" ]; then + while :; do + echo + echo "What address should mail from DisOrder come from?" + read -r mail_sender + case "$mail_sender" in + *@* ) + break + ;; + * ) + echo "Email address must contain an '@' sign" + ;; + esac + done +fi + +if [ -z "$register" ]; then + while :; do + echo + echo "Do you want to enable online registration? (Enter 'y' or 'n')" + read -r register + case $register in + y | n ) + break + ;; + esac + done +fi echo echo "Proposed DisOrder setup:" @@ -140,8 +274,14 @@ if [ $port = none ]; then else echo " TCP port to listen on: $port" fi -echo " SMTP Server: $smtp_server" +if [ ! -z "$smtp_server" ]; then + echo " SMTP Server: $smtp_server" +fi echo " Sender address: $mail_sender" +echo " Online registration: $register" +if [ $play = network ]; then + echo " Send sound to: $mcast_address port $mcast_port" +fi echo "Is this OK? (Enter 'y' or 'n')" read -r ok @@ -168,7 +308,12 @@ echo "user $user" >> pkgconfdir/config.new if [ $port != none ]; then echo "listen 0.0.0.0 $port" >> pkgconfdir/config.new fi -echo "smtp_server $smtp_server" >> pkgconfdir/config.new +if [ $play = network ]; then + echo "broadcast $mcast_address $mcast_port" >> pkgconfdir/config.new +fi +if [ ! -z "$smtp_server" ]; then + echo "smtp_server $smtp_server" >> pkgconfdir/config.new +fi echo "mail_sender $mail_sender" >> pkgconfdir/config.new echo @@ -220,32 +365,32 @@ pick() { case $os in Mac ) # Apple don't seem to believe in creating a user as a discrete operation - if dscl / -read /Groups/$group >/dev/null 2>&1; then + if dscl . -read /Groups/$group >/dev/null 2>&1; then echo "$group group already exists" else echo "Creating $group group" - gids=$(dscl / -list /Groups PrimaryGroupID|awk '{print $2}') + gids=$(dscl . -list /Groups PrimaryGroupID|awk '{print $2}') gid=$(pick $gids) echo "(picked gid $gid)" - dscl / -create /Groups/$group - dscl / -create /Groups/$group PrimaryGroupID $gid - dscl / -create /Groups/$group Password \* + dscl . -create /Groups/$group + dscl . -create /Groups/$group PrimaryGroupID $gid + dscl . -create /Groups/$group Password \* fi - if dscl / -read /Users/$user >/dev/null 2>&1; then + if dscl . -read /Users/$user >/dev/null 2>&1; then echo "$user user already exists" else echo "Creating $user user" - uids=$(dscl / -list /Users UniqueID|awk '{print $2}') + uids=$(dscl . -list /Users UniqueID|awk '{print $2}') uid=$(pick $uids) echo "(picked uid $uid)" - gid=$(dscl / -read /Groups/$group PrimaryGroupID | awk '{print $2}') - dscl / -create /Users/$user - dscl / -create /Users/$user UniqueID $uid - dscl / -create /Users/$user UserShell /usr/bin/false - dscl / -create /Users/$user RealName 'DisOrder server' - dscl / -create /Users/$user NFSHomeDirectory pkgstatedir - dscl / -create /Users/$user PrimaryGroupID $gid - dscl / -create /Users/$user Password \* + gid=$(dscl . -read /Groups/$group PrimaryGroupID | awk '{print $2}') + dscl . -create /Users/$user + dscl . -create /Users/$user UniqueID $uid + dscl . -create /Users/$user UserShell /usr/bin/false + dscl . -create /Users/$user RealName 'DisOrder server' + dscl . -create /Users/$user NFSHomeDirectory pkgstatedir + dscl . -create /Users/$user PrimaryGroupID $gid + dscl . -create /Users/$user Password \* fi ;; FreeBSD ) @@ -292,7 +437,6 @@ Mac ) launchctl load /Library/LaunchDaemons echo "Starting DisOrder server" launchctl start uk.org.greenend.rjk.disorder - CGIBIN=/Library/WebServer/CGI-Executables DOCROOT=/Library/WebServer/Documents sever_running=true ;; @@ -320,7 +464,6 @@ FreeBSD ) esac web=$1 echo "Found $web" - CGIBIN=$web/cgi-bin DOCROOT=$web/data server_running=true ;; @@ -358,13 +501,6 @@ Linux ) break fi done - echo "Looking for cgi-bin directory" - for d in /var/www/cgi-bin /usr/lib/cgi-bin; do - if [ -d $d ]; then - CGIBIN=$d - break - fi - done server_running=true ;; * ) @@ -384,27 +520,9 @@ else ln -s pkgdatadir/static $DOCROOT/disorder fi -echo -if [ -z "$CGIBIN" ]; then - echo "Cannot find your web server's cgi-bin directory" -else - echo "Installing CGI in $CGIBIN" - install -m 555 server/disorder.cgi $CGIBIN/disorder -fi - if $server_running; then - while :; do - echo - echo "Do you want to enable online registration? (Enter 'y' or 'n')" - read -r reg - case $reg in - y | n ) - break - ;; - esac - done - echo first=true + sleep 5 while ! disorder version >/dev/null 2>&1; do if $first; then echo "Waiting for server startup to complete..." @@ -412,7 +530,7 @@ if $server_running; then fi sleep 1 done - if [ $reg = y ]; then + if [ $register = y ]; then echo "Creating guest user with 'register' right" disorder setup-guest else