Merge pull request #10 from CPSECapstone/install-check

Install check

README.md

@@ -58,3 +58,7 @@ To compile the installer via advanced installer, create a new project with the f
 - Make sure that an up-to-date femr docker image has been pushed to Dockerhub from the super-femr repository.
 - Make sure your AWS configuration file is configured to write to the release S3 bucket.
 - Run release.py (if necessary, you can install the necessary requirements from the requirements.txt at the top level of this repository)
+
+# Notes for DNS
+
+There is a DNS server as a package in the docker compose. This DNS server is configured to redirect the femr.net to 192.168.1.2 This can be changed by editing the application/dns.conf. Details on how users can configure their routers to use the DNS can be found here: https://docs.google.com/document/d/1opcGO7SUYSOtQPjx1CUQ2PdLrzKxleHNVE4bLMBpUkE/edit?usp=sharing

macOS-x64/application/dns.conf

@@ -0,0 +1,12 @@
+#Configuration for the dns service that will point to femr
+
+#log all dns queries
+log-queries
+#dont use hosts nameservers
+no-resolv
+#use google as default nameservers
+server=8.8.8.8
+expand-hosts
+#explicitly define host-ip mappings
+address=/femr.net/192.168.1.2
+

macOS-x64/application/docker-compose.yml

@@ -7,8 +7,8 @@ services:
     environment:
       MYSQL_DATABASE: "femr_db"
       MYSQL_USER: "femr"
-      MYSQL_PASSWORD: "password"
-      MYSQL_ROOT_PASSWORD: "password"
+      MYSQL_PASSWORD: "__PASSWORD__"
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
     ports:
       - "3306:3306"
     expose:
@@ -23,17 +23,28 @@ services:
       - db:mysql
     depends_on:
       - db
+    entrypoint: sbt start -Dhttps.port=9443 -Dpidfile.path=/dev/null
     tty: true
     ports:
-      - "9000:9000"
+      - "80:9000"
+      - "433:9443"
     expose:
       - "9000"
+      - "9443"
+
     volumes:
-      - ./femr/conf:/home/femrapp/conf
-    environment:
-      DB_URL: "jdbc:mysql://db:3306/femr_db?characterEncoding=UTF-8&useSSL=false"
-      DB_USER: "root"
-      DB_PASS: "password"
+      - ./femr/conf:/usr/src/app/conf
+  dns:
+    restart: always
+    image: strm/dnsmasq
+    volumes:
+      - ./dns.conf:/etc/dnsmasq.conf
+    ports:
+      - "53:53/udp"
+    expose:
+      - "53"
+    cap_add:
+      - NET_ADMIN
 
 volumes:
   db-data:

macOS-x64/application/femr/conf/application.conf

@@ -20,11 +20,15 @@ bcrypt.workFactor=10
 play.http.secret.key="xSLvw;4MmQfa0uc2oB8OuIh[=?t;hJ4wN=SGK8Xfmo?WHgQ2h>s@<hU?291ZO;/o"
 play.il8n.langs="en"
 
+https.port=9443
+http.port="disabled"
+
+
 #Register MySQL database settings
 db.default.driver="com.mysql.jdbc.Driver"
-db.default.url="jdbc:mysql://localhost/femr_db?characterEncoding=UTF-8"
-db.default.username="sa"
-db.default.password="__PASSWORD__"
+db.default.url="jdbc:mysql://db:3306/femr_db?characterEncoding=UTF-8"
+db.default.username="femr"
+db.default.password="password"
 db.default.logStatements=false
 
 #Register paths for photos
@@ -84,8 +88,11 @@ play.http.filters = "femr.util.filters.Filters"
 
 #Akka HTTP server timeout overrides
 play.server.http.idleTimeout = 60s
+play.server.akka.http.port = 4000
 play.server.akka.requestTimeout = 60s
 
+
+
 play.assets {
   path = "/public"
   urlPrefix = "/assets"

macOS-x64/build-macos-x64.sh

@@ -12,6 +12,8 @@ TIME=`date +%H:%M:%S`
 LOG_PREFIX="[$DATE $TIME]"
 SQL_CONTAINER="mysql:5.7"
 FEMR_CONTAINER="waldenhillegass/super-femr:latest"
+DNS_CONTATINER="strm/dnsmasq"
+
 
 function printSignature() {
   cat "$SCRIPTPATH/utils/ascii_art.txt"
@@ -98,9 +100,12 @@ pull_and_save_docker_images() {
     log_info "Pulling docker images... If this fails, make sure Docker is running."
     docker pull $SQL_CONTAINER
     docker pull $FEMR_CONTAINER
+    docker pull $DNS_CONTATINER
     log_info "Saving docker images.."
     docker save $SQL_CONTAINER > ${TARGET_DIRECTORY}"/darwinpkg/Library/${PRODUCT}/${VERSION}/mysql:5.7.tar"
     docker save $FEMR_CONTAINER > ${TARGET_DIRECTORY}"/darwinpkg/Library/${PRODUCT}/${VERSION}/femr.tar"
+    docker save $DNS_CONTATINER > ${TARGET_DIRECTORY}"/darwinpkg/Library/${PRODUCT}/${VERSION}/dnsmasq.tar"
+    log_info "Completed moving docker images"
 }
 
 copyDarwinDirectory(){