fix broken stuff, enable remoteip

diff --git a/GenaSYS.sh b/GenaSYS.sh
index b0c7d17..99eccf7 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 
 ##############################################################################
 #   Copyright (c) 2010-2019 Georgia Public Library Service."
@@ -1997,16 +1997,17 @@ for BRICK in $(seq $BRICKCOUNT)
     eval cp -f $TEMPLATEDIR/nginx/osrf-ws-http-proxy ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/nginx/sites-available
     
     # set up eg_vhost.conf
+    eval cp -f $TEMPLATEDIR/apache2/eg_vhost.conf $TMPFOLDER/eg_vhost.conf
     if [[ "$USE_NOVELIST" == "y" || "$USE_NOVELIST" == "Y" ]]; then
-        eval sed -i "s^GENASYS_NOVELIST_PROFILE^$NOVELIST_PROFILE^" $TEMPLATEDIR/apache2/eg_vhost.conf
-        eval sed -i "s^GENASYS_NOVELIST_PASSWORD^$NOVELIST_PROFILE^" $TEMPLATEDIR/apache2/eg_vhost.conf
+        eval sed -i "s^GENASYS_NOVELIST_PROFILE^$NOVELIST_PROFILE^" $TMPFOLDER/eg_vhost.conf
+        eval sed -i "s^GENASYS_NOVELIST_PASSWORD^$NOVELIST_PASSWORD^" $TMPFOLDER/eg_vhost.conf
     fi
     
     if [[ "$USE_SYNDETICS" == "y" || "$USE_SYNDETICS" == "Y" ]]; then
-        eval sed -i "s^GENASYS_SYNDETICS_USER_ID^$SYNDETICS_USER_ID^" $TEMPLATEDIR/apache2/eg_vhost.conf
+        eval sed -i "s^GENASYS_SYNDETICS_USER_ID^$SYNDETICS_USER_ID^" $TMPFOLDER/eg_vhost.conf
     fi
-    eval sed -i "s^MEMCACHE01_IP^$MEMCACHE01_IP^" $TEMPLATEDIR/apache2/eg_vhost.conf
-    eval cp -f $TEMPLATEDIR/apache2/eg_vhost.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
+    eval sed -i "s^MEMCACHE01_IP^$MEMCACHE01_IP^" $TMPFOLDER/eg_vhost.conf
+    eval cp -f $TMPFOLDER/eg_vhost.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
 
     # no longer configuring mpm_prefork in apache2.conf, has its own config file
     eval cp -f $TEMPLATEDIR/apache2/mpm_prefork.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/mods-available
@@ -3293,15 +3294,6 @@ do
             sed -i "s^EG_ADMIN_USER^$EG_ADMIN_USER^g" setup-head.sh
             sed -i "s^EG_ADMIN_PASS^$(echo $EG_ADMIN_PASSWORD | sed  -e 's^&^\\\&^g' -e 's/\^/\\\^/g')^g" setup-head.sh
             sed -i "s^MEMCACHE01_IP^$MEMCACHE01_IP^g" setup-head.sh
-            then
-                echo "NOVELIST_PROFILE=${NOVELIST_PROFILE}" > ../setup_${SUBFOLDER}/.Novelist.txt
-                echo "NOVELIST_PASSWORD=${NOVELIST_PASSWORD}" >> ../setup_${SUBFOLDER}/.Novelist.txt
-                chmod 600 ../setup_${SUBFOLDER}/.Novelist.txt
-            fi
-            then
-                echo "SYNDETICS_USER_ID=${SYNDETICS_USER_ID}" > ../setup_${SUBFOLDER}/.Syndetics.txt
-                chmod 600 ../setup_${SUBFOLDER}/.Syndetics.txt
-            fi
         fi
         
 #TODO check drone pkging. 
@@ -3517,4 +3509,5 @@ echo -e "saved as $COL_YELLOW${NEW_CONFIG_FILE}"$COL_RESET
 
 echo "DEBUG: BRICKHEADLIST is: ${BRICKHEADLIST}"
 
-#rm -rf $TMPFOLDER
+### Be a good citizen and clean up after yourself
+rm -rf $TMPFOLDER

diff --git a/templates/setup-head.sh b/templates/setup-head.sh
index d79746d..2739024 100755 (executable)
--- a/templates/setup-head.sh
+++ b/templates/setup-head.sh
@@ -202,6 +202,7 @@ a2dismod mpm_event
 a2enmod mpm_prefork
 a2enmod cgi
 a2enmod xmlent
+a2enmod remoteip
 a2enmod idlchunk
 a2disconf serve-cgi-bin