Add ability to run autogen on first boot

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 675e3e4..aeb0861 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 ##############################################################################
 #   Copyright (c) 2010-2013 Georgia Public Library Service."
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.86"
-       DATE_="2010-11-23; last update: 2018-01-09"
+    VERSION_="1.87"
+       DATE_="2010-11-23; last update: 2018-11-06"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -53,7 +53,7 @@ done
 
 WD=$(dirname $(readlink -f $0))
 CUSTOMDIR="$WD/custom"
-EG_VERSION="3.2-beta1"
+EG_VERSION="3.0.2"
 UBUNTU_CODENAME="trusty"
 LICENSE="$WD/License.txt"
 TEMPLATEDIR="$WD/templates"
@@ -1855,7 +1855,7 @@ if [ "$USE_SYNDETICS" == "y" ]|| [ "$USE_SYNDETICS" == "Y" ]
        sed -i 's^OpenLibrary added content^Syndetics added content^g' $TMPOPENSRF_XML
        sed -i "s^MODULE_USER_ID^$SYNDETICS_USER_ID^g" $TMPOPENSRF_XML
 #      sed -i 's^<!-- <base_url>http://syndetics.com/index.aspx</base_url> -->^<base_url>http://syndetics.com/index.aspx</base_url>^g' $TMPOPENSRF_XML
-       sed -i '/<module>OpenILS::WWW::/a \\t    <base_url>https://syndetics.com/index.aspx</base_url>' $TMPOPENSRF_XML
+       sed -i '/<module>OpenILS::WWW::/a \\t    <base_url>http://syndetics.com/index.aspx</base_url>' $TMPOPENSRF_XML
 fi
 
 ### Start setup of munin.conf file
@@ -1908,7 +1908,7 @@ for BRICK in $(seq $BRICKCOUNT)
        eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/data/vandelay
        eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/data/locale/opac
        eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/web/reporter
-       
+       eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/systemd/system
        
         ### head gets exports
        if [ "$ROBOTS_TXT" = "y" ] || [ "$ROBOTS_TXT" = "Y" ] ### Copy robots.txt if selected.
@@ -1972,6 +1972,7 @@ for BRICK in $(seq $BRICKCOUNT)
         eval cp -f $TEMPLATEDIR/apt/head_apt.list ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/\$BRICKHOSTNAME${BRICK}-head_apt.list
         eval cp -f $TMPFOLDER/60-evergreen-ils.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/rsyslog.d
        eval cp -f $TEMPLATEDIR/rsyslog/50-default.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/rsyslog.d
+       eval cp -f $TEMPLATEDIR/autogen.service ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/systemd/system
        #eval sed -i "s^CLUSTER_DOMAINNAME^${CLUSTERDOMAINNAME}^g" ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/60-evergreen-ils.conf
        
         eval echo "\$BRICKHOSTNAME${BRICK}-head" > ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/hostname
@@ -2073,6 +2074,7 @@ for BRICK in $(seq $BRICKCOUNT)
        eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/data/vandelay
        eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/data/locale/opac
        eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/web/reporter
+       eval mkdir -p ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/systemd/system
        ### head gets exports
        if [ "$ROBOTS_TXT" = "y" ] || [ "$ROBOTS_TXT" = "Y" ] ### Copy robots.txt if selected.
         then
@@ -2139,6 +2141,7 @@ for BRICK in $(seq $BRICKCOUNT)
        eval cp -f $TEMPLATEDIR/apt/head_apt.list ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/\$BRICKHOSTNAME${BRICK}-head_apt.list
        eval cp -f $TMPFOLDER/60-evergreen-ils.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/rsyslog.d
        eval cp -f $TEMPLATEDIR/rsyslog/50-default.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/rsyslog.d
+       eval cp -f $TEMPLATEDIR/autogen ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/systemd/system
        #eval cp -f /tmp/rsyslog.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/
        eval echo "\$BRICKHOSTNAME${BRICK}-head" > ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/hostname
        eval echo "\$BRICKHOSTNAME${BRICK}-head" >> $TMPOSRFNODES
@@ -2551,6 +2554,8 @@ done
 ### setup exports for utility.
 
 for UTILITY in $MACHINES_UTILITY; do
+mkdir -p "$OUTDIR/$UTILITY/etc/systemd/system"
+cp -f "$TMPFOLDER/autogen.service" "$OUTDIR/$UTILITY/etc/systemd/system"
 cp -f "$TMPFOLDER/exports" "$OUTDIR/$UTILITY/etc/"
 
 ### action trigger filters for utility.
@@ -2876,7 +2881,6 @@ echo 'cp "${WD}/monitoring/check_postgres.pl" "/usr/lib/nagios/plugins"' >>$TMPS
 echo 'cp "${WD}/monitoring/check_cpu.sh" "/usr/lib/nagios/plugins"' >>$TMPSETUPMONITOR
 echo 'cp "${WD}/monitoring/check_freemem" "/usr/lib/nagios/plugins"' >>$TMPSETUPMONITOR
 echo 'cp "${WD}/monitoring/check_osrf" "/usr/lib/nagios/plugins"' >>$TMPSETUPMONITOR
-echo 'cp "${WD}/monitoring/check_osrf.sudoers" "/etc/sudoers.d"' >>$TMPSETUPMONITOR
 echo 'cp "${WD}/monitoring/nrpe_local.cfg" "/etc/nagios"' >>$TMPSETUPMONITOR
 chmod 755 $TMPSETUPMONITOR
 
@@ -3109,7 +3113,6 @@ do
                cp $TEMPLATEDIR/monitor/check_postgres.pl ../setup_${SUBFOLDER}/monitoring
                cp $TEMPLATEDIR/monitor/check_cpu.sh ../setup_${SUBFOLDER}/monitoring
                cp $TEMPLATEDIR/monitor/check_osrf ../setup_${SUBFOLDER}/monitoring
-               cp $TEMPLATEDIR/monitor/check_osrf.sudoers ../setup_${SUBFOLDER}/monitoring
                cp -r $TEMPLATEDIR/apache2/websockets ../setup_${SUBFOLDER}
                touch ../setup_${SUBFOLDER}/.osrf_node
                sed -i "s^HOSTNAME^${SUBFOLDER}^g" ../setup_${SUBFOLDER}/debconf-settings

diff --git a/templates/autogen.service b/templates/autogen.service
new file mode 100644 (file)
index 0000000..dc48869
--- /dev/null
+++ b/templates/autogen.service
@@ -0,0 +1,11 @@
+[Unit]
+After=opensrf.service
+ConditionPathExists=!/openils/var/web/eg_cache_hash
+
+[Service]
+Type=oneshot
+User=opensrf
+ExecStart=/openils/bin/autogen.sh
+
+[Install]
+WantedBy=multi-user.target

diff --git a/templates/setup-head.sh b/templates/setup-head.sh
index 35b217a..0147837 100755 (executable)
--- a/templates/setup-head.sh
+++ b/templates/setup-head.sh
@@ -439,6 +439,8 @@ ConfigNetwork
 ## Monitored hosts
 SetupMonitoring
 
+### Enable systemd autogen service for first boot
+systemctl enable autogen
 
 echo
 echo

diff --git a/templates/setup.sh b/templates/setup.sh
index a5824a1..59d8771 100755 (executable)
--- a/templates/setup.sh
+++ b/templates/setup.sh
@@ -476,6 +476,8 @@ EOF
                echo -e "Not setting up crontab or ssh keys.."$COL_RESET
                sleep 3
        fi
+### Enable systemd autogen service for first boot
+systemctl enable autogen
 fi
 
 AutoGen () { ### Run Autogen # this is currently defunct.