Full Linux support for scripts/setup and scripts/teardown. This is

only tested on Debian but has a bit of knowledge of Centos too, so
might well work there (or on its commercial variant).

diff --git a/scripts/setup.in b/scripts/setup.in
index 370013eba9f30fe7d7b378a3a1a7256b04b85a27..803b0ae1c9fd4c28cef8d7911995ca16d3b67ebf 100755 (executable)
--- a/scripts/setup.in
+++ b/scripts/setup.in
@@ -41,11 +41,10 @@ FreeBSD )
 Linux )
   if grep Debian /etc/issue >/dev/null 2>&1; then
     echo "You appear to be running Debian - please use .debs instead"
 Linux )
   if grep Debian /etc/issue >/dev/null 2>&1; then
     echo "You appear to be running Debian - please use .debs instead"

-    exit 1
-  fi
-  if grep Ubuntu /etc/issue >/dev/null 2>&1; then
+    echo
+  elif grep Ubuntu /etc/issue >/dev/null 2>&1; then

     echo "You appear to be running Ubuntu - please use .debs instead"
     echo "You appear to be running Ubuntu - please use .debs instead"

-    exit 1
+    echo

   fi
   echo "Linux detected"
   os=Linux
   fi
   echo "Linux detected"
   os=Linux


@@ -121,10 +120,20 @@ done
 echo
 echo "What host should DisOrder use as an SMTP server?"
 read -r smtp_server
 echo
 echo "What host should DisOrder use as an SMTP server?"
 read -r smtp_server

-  
-echo
-echo "What address should mail from DisOrder come from?"
-read -r mail_sender
+
+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

 
 echo
 echo "Proposed DisOrder setup:"
 
 echo
 echo "Proposed DisOrder setup:"


@@ -286,13 +295,9 @@ Mac )
   launchctl load /Library/LaunchDaemons
   echo "Starting DisOrder server"
   launchctl start uk.org.greenend.rjk.disorder
   launchctl load /Library/LaunchDaemons
   echo "Starting DisOrder server"
   launchctl start uk.org.greenend.rjk.disorder

-  echo "Installing CGI"
-  install -m 555 server/disorder.cgi /Library/WebServer/CGI-Executables/disorder
-  echo "Setting up link to CGI's dependencies"
-  rm -f /Library/WebServer/Documents/disorder
-  ln -s pkgdatadir/static /Library/WebServer/Documents/disorder
-  echo
-  echo "You must sudo disorder setup-guest [--no-online-registration] next."
+  CGIBIN=/Library/WebServer/CGI-Executables
+  DOCROOT=/Library/WebServer/Documents
+  sever_running=true

   ;;
 FreeBSD )
   echo "Installing startup script into /etc/rc.d"
   ;;
 FreeBSD )
   echo "Installing startup script into /etc/rc.d"


@@ -318,17 +323,98 @@ FreeBSD )
   esac
   web=$1
   echo "Found $web"
   esac
   web=$1
   echo "Found $web"

-  echo "Installing CGI"
-  install -m 555 server/disorder.cgi $web/cgi-bin/disorder
-  echo "Setting up link to CGI's dependencies"
-  rm -f $web/data/disorder
-  ln -s pkgdatadir/static $web/data/disorder
-  echo
-  echo "You must sudo disorder setup-guest [--no-online-registration] next."
+  CGIBIN=$web/cgi-bin
+  DOCROOT=$web/data
+  server_running=true
+  ;;
+Linux )
+  echo "Looking for init scripts directory"
+  for d in /etc/rc.d /etc; do
+    if [ -d $d/init.d ]; then
+      RC_D=$d
+      break
+    fi
+  done
+  if [ -z "$RC_D" ]; then
+    echo "Cannot find your init scripts directory"
+  else
+    echo "Installing init script into $RC_D/init.d"
+    install -m 755 examples/disorder.init $RC_D/init.d/disorder
+    echo "Linking init script into $RC_D/rc*.d"
+    for n in 2 3 4 5; do
+      echo " $RC_D/rc$n.d/S99disorder -> $RC_D/init.d/disorder"
+      rm -f $RC_D/rc$n.d/S99disorder
+      ln -s $RC_D/init.d/disorder $RC_D/rc$n.d/S99disorder
+    done
+    for n in 0 1 6; do
+      echo " $RC_D/rc$n.d/K01disorder -> $RC_D/init.d/disorder"
+      rm -f $RC_D/rc$n.d/K01disorder
+      ln -s $RC_D/init.d/disorder $RC_D/rc$n.d/K01disorder
+    done
+    echo "Starting DisOrder server"
+    $RC_D/init.d/disorder start
+  fi
+  echo "Looking for web server document root"
+  for d in /var/www/html /var/www; do
+    if [ -d $d ]; then
+      DOCROOT=$d
+      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

   ;;
 * )
   ;;
 * )

+  echo

   echo "Sorry, I don't know how to install the server on this platform."
   echo "You will have to do that by hand."
   echo "Sorry, I don't know how to install the server on this platform."
   echo "You will have to do that by hand."

-  exit 1
+  server_running=false

   ;;
 esac
   ;;
 esac

+
+echo
+if [ -z "$DOCROOT" ]; then
+  echo "Cannot find your web server's document root"
+else
+  echo "Setting up link to CGI's dependencies in $DOCROOT"
+  rm -f $DOCROOT/disorder
+  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
+  if [ $reg = y ]; then
+    echo "Creating guest user with 'register' right"
+    disorder setup-guest
+  else
+    echo "Creating guest user without 'register' right"
+    disorder setup-guest --no-online-registration
+  fi
+fi
+
+echo
+echo Done

diff --git a/scripts/teardown.in b/scripts/teardown.in
index 63df4eb166e60c8182c4a062a68791271d66e7ab..4ef1e4dac701210934f8e779b5213946f2844ea5 100755 (executable)
--- a/scripts/teardown.in
+++ b/scripts/teardown.in
@@ -20,35 +20,54 @@
 #
 set -e
 
 #
 set -e
 

+s() {
+  echo ">" "$@"
+  "$@"
+}
+

 case $(uname -s) in
 FreeBSD )
   APACHE=apache22
   echo "* killing disorderd processes"
 case $(uname -s) in
 FreeBSD )
   APACHE=apache22
   echo "* killing disorderd processes"

-  killall disorderd || true
+  s killall disorderd || true

   echo "* removing files"
   echo "* removing files"

-  rm -f /usr/local/www/$APACHE/cgi-bin/disorder
-  rm -f /usr/local/www/$APACHE/data/disorder
-  rm -f /etc/rc.d/disorder
-  rm -rf pkgstatedir
-  rm -rf pkgconfdir
+  s rm -f /usr/local/www/$APACHE/cgi-bin/disorder
+  s rm -f /usr/local/www/$APACHE/data/disorder
+  s rm -f /etc/rc.d/disorder
+  s rm -rf pkgstatedir
+  s rm -rf pkgconfdir

   echo "* removing user and group"
   echo "* removing user and group"

-  pw userdel jukebox || true
-  pw groupdel jukebox || true
+  s pw userdel jukebox || true
+  s pw groupdel jukebox || true

   ;;
 Darwin )
   echo "* stopping server"
   ;;
 Darwin )
   echo "* stopping server"

-  launchctl stop uk.org.greenend.rjk.disorder || true
-  launchctl unload /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist || true
+  s launchctl stop uk.org.greenend.rjk.disorder || true
+  s launchctl unload /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist || true
+  echo "* removing files"
+  s rm -f /Library/WebServer/CGI-Executables/disorder
+  s rm -f /Library/WebServer/Documents/disorder
+  s rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
+  s rm -rf pkgstatedir
+  s rm -rf pkgconfdir
+  echo "* removing user and group"
+  s dscl / -delete /Users/jukebox || true
+  s dscl / -delete /Groups/jukebox || true
+  ;;
+Linux )
+  echo "* stopping server"
+  s killall disorderd || true

   echo "* removing files"
   echo "* removing files"

-  rm -f /Library/WebServer/CGI-Executables/disorder
-  rm -f /Library/WebServer/Documents/disorder
-  rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
-  rm -rf pkgstatedir
-  rm -rf pkgconfdir
+  s rm -f /usr/lib/cgi-bin/disorder /var/www/cgi-bin/disorder
+  s rm -f /var/www/disorder /var/www/html/disorder
+  s rm -f /etc/init.d/disorder /etc/rc.d/init.d/disorder
+  s rm -f /etc/rc*.d/*disorder /etc/rc.d/rc*.d/disorder
+  s rm -rf pkgstatedir
+  s rm -rf pkgconfdir

   echo "* removing user and group"
   echo "* removing user and group"

-  dscl / -delete /Users/jukebox || true
-  dscl / -delete /Groups/jukebox || true
-  ;;  
+  s userdel jukebox || true
+  s groupdel jukebox || true
+  ;;

 * )
   echo Unknown operating system >&2
   exit 1
 * )
   echo Unknown operating system >&2
   exit 1