trusty installer cont.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/installer/trusty/eg_trusty_installer.sh b/installer/trusty/eg_trusty_installer.sh
index 8f08ea9..124b84e 100755 (executable)
--- a/installer/trusty/eg_trusty_installer.sh
+++ b/installer/trusty/eg_trusty_installer.sh
@@ -255,7 +255,7 @@ function setting_ldconfig_and_rsyslog_and_hosts_and_ejabberd {
     echo Return Value = $?
     # Configure rsyslog and restart
     cp /home/opensrf/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf /etc/rsyslog.d/evergreen.conf
-    /etc/init.d/rsyslog restart
+    service rsyslog restart
     echo Return Value = $?
     if [ ! "$(grep 'public.localhost' /etc/hosts)" ]; then
 
@@ -282,14 +282,14 @@ EOF
     # Patch Ejabberd and register users
     if [ ! "$(grep 'public.localhost' /etc/ejabberd/ejabberd.cfg)" ]; then
         cd /etc/ejabberd/
-        /etc/init.d/ejabberd stop;
+        service ejabberd stop
         killall beam epmd; # just in case
         cp ejabberd.cfg /root/ejabberd.cfg.orig
         patch -p0 < $BASE_DIR/ejabberd.EG.patch
         chown ejabberd:ejabberd ejabberd.cfg
         echo starting ejabberd after patching
         date
-        /etc/init.d/ejabberd start
+        service ejabberd start
         echo Return Value = $?
         sleep 10;
         ejabberdctl register router  private.localhost $JABBER_PASSWORD
@@ -472,12 +472,12 @@ function configure_database {
 function configure_apache {
     echo _.-~= configure apache
     date
-    /etc/init.d/apache2 stop
+    service apache2 stop
     # Copy apache configs into place and create SSL cert
     cd /home/opensrf/Evergreen/
-    cp Open-ILS/examples/apache_24/eg.conf       /etc/apache2/sites-available/
-    cp Open-ILS/examples/apache_24/eg_vhost.conf /etc/apache2/
-    cp Open-ILS/examples/apache/eg_startup    /etc/apache2/
+    cp Open-ILS/examples/apache_24/eg_24.conf       /etc/apache2/sites-available/eg.conf
+    cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+    cp Open-ILS/examples/apache/eg_startup          /etc/apache2/
 
     mkdir -p /etc/apache2/ssl;
     if [ ! -f /etc/apache2/ssl/server.key ] ; then
@@ -533,7 +533,7 @@ function start_evergreen {
     echo Return Value = $?
 
     echo Restarting Apache
-    /etc/init.d/apache2 restart
+    service apache2 restart
     echo Return Value = $?
 
     echo End of Starting Evergreen =~-._