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

server/docker/Dockerfile

@@ -33,11 +33,6 @@ RUN \
 COPY setup-testdb /root/setup-testdb
 
 RUN bash /root/setup-testdb
-#  service mysql start && \
-#  bash -c 'mysql < <( echo -e "create database busdb;\ncreate user bus;\ngrant all privileges on busdb.* to \'bus\'@\'%\';\nflush privileges;\n" ) ' && \
-#  su bus -c " cd /home/bus && \
-#    mysql -u bus busdb < popufare/server/create_tables.sql && \
-#    mysql -u bus busdb < popufare/server/testing/db/setup-testdb.sql "
 
 ## setup test ssh access
 ##
@@ -53,6 +48,18 @@ RUN su bus -c \
 RUN \
   apt-get install -y vim
 
+RUN \
+  mkdir -p /etc/ridelogic && \
+  mkdir -p /etc/ridelogic/logs && \
+  mkdir -p /var/log/ridelogic && \
+  mkdir -p /var/run/ridelogic && \
+  cp -f /home/bus/popufare/server/install/etc/ridelogic/api.conf /etc/ridelogic && \
+  cp -f /home/bus/popufare/server/install/etc/ridelogic/daemon.conf /etc/ridelogic && \
+  cp -f /home/bus/popufare/server/scripts/RideLogic.pm /usr/share/perl5 && \
+  cp -f /home/bus/popufare/server/scripts/RideLogicDBI.pm /usr/share/perl5 && \
+  cp -f /home/bus/popufare/server/scripts/RideLogicACL.pm /usr/share/perl5 && \
+  cp -f /home/bus/popufare/server/scripts/RideLogicAPIQueryWrapper.pm /usr/share/perl5
+
 # main startup scripts
 #
 COPY ./startup_and_persist.sh /root/startup_and_persist.sh
@@ -62,5 +69,4 @@ RUN \
 
 EXPOSE 80 22 443 6055 2857 7277 2455 3556 8377
 
-
 CMD ["/root/startup_and_persist.sh"]

server/testing/test-vectors/testvector-avls

@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# To be run on the server host
+#
+
+# equp_num,driver,paddle,route,trip,stop,chirp_time,lat,long,heading,vel
+#
+echo -e '9999\t00078\t6055\t2\t3\t5\t1567437420\t4226.69928\t-7630.41112\t1\t2' | \
+  nc localhost 2857

server/testing/test-vectors/testvector-billing

@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# To be run on the server host
+#
+
+# equip,driver,padde,route,trip,stop,ride_time,lat,long,action,rule,ruleparam,reason,credential,logical_card_id,cash_value,stop_name,usec
+echo -e '9999\t00078\t6055\t2\t3\t5\t1567437420\t4226.69928\t-7630.41112\tACCEPT\tTEST-ORG-NRIDE\t5\t.\t2:7370000000007015\t1\t0\ttest route mid\t0' | \
+  nc localhost 2455

server/testing/test-vectors/testvector-buspass

@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+# To be run on the server
+#
+
+echo -e 'QUERY\t1' | nc localhost 7277