Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

server/docker/run_daemon.sh

@@ -9,7 +9,7 @@ export UPDATE_DAEMON_PORT="8377"
 
 #docker build --no-cache -t popufare .
 
-docker run -d popufare \
+docker run \
   -p 8080:80 \
   -p 4430:443 \
   -p $SSH_DEFAULT_PORT:22 \
@@ -18,6 +18,8 @@ docker run -d popufare \
   -p $BILLDB_DAEMON_PORT:$BILLDB_DAEMON_PORT \
   -p $HELLO_DAEMON_PORT:$HELLO_DAEMON_PORT \
   -p $UPDATE_DAEMON_PORT:$UPDATE_DAEMON_PORT \
-  bus
+  -t -d popufare
+
+#  bus
 
 docker ps

server/docker/startup_and_persist.sh

@@ -1,18 +1,24 @@
 #!/bin/bash
 
 service apache2 start
+service mysql start
 service ssh start
 
 export D=/home/bus/popufare/server/daemons
 
-su bus -c " $D/avls_server/avls_server.pl >> /tmp/avls.log " &
-su bus -c " $D/hello_daemon/hello_daemon.pl >> /tmp/hello.log  " &
-su bus -c " cd $D/billing_server ; $D/billing_server/billing_server.pl >> /tmp/billing_server.log " &
-su bus -c " $D/version_server/version_daemon.pl >> /tmp/version_daemon.log  " &
-su bus -c " $D/buspass_server/buspass_server.pl >> /tmp/buspass_server.log  " &
+#su bus -c " $D/avls_server/avls_server.pl >> /tmp/avls.log " &
+#su bus -c " $D/hello_daemon/hello_daemon.pl >> /tmp/hello.log  " &
+#su bus -c " cd $D/billing_server ; $D/billing_server/billing_server.pl >> /tmp/billing_server.log " &
+#su bus -c " $D/version_server/version_daemon.pl >> /tmp/version_daemon.log  " &
+#su bus -c " $D/buspass_server/buspass_server.pl >> /tmp/buspass_server.log  " &
 
-while [ true ] ;
-do
+$D/avls_server/ridelogic_avlsd
+$D/billing_server/ridelogic_billingd
+$D/buspass_server/ridelogic_buspassd
+$D/hello_daemon/ridelogic_hellod
+$D/version_server/ridelogic_versiond
+
+while [ true ] ; do
   echo heartbeat
-  sleep 3
+  sleep 5
 done