Fix deployment

mobile/android/app/build.gradle

@@ -101,8 +101,8 @@ android {
         applicationId "com.deightonar"
         minSdkVersion 24
         targetSdkVersion 27
-        versionCode 3
+        versionCode 4
-        versionName "1.0.0"
+        versionName "1.0.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

mobile/android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.deightonar"
-    android:versionCode="3"
+    android:versionCode="4"
-    android:versionName="1.0.0">
+    android:versionName="1.0.1">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

mobile/ios/DeightonAR/Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20180516.0</string>
+	<string>20180518.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

mobile/src/version.js

@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.0',
+  version: '1.0.1',
-  fullVersion: '1.0.0-20180516.0',
+  fullVersion: '1.0.1-20180518.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deighton-ar",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Deighton AR Training System",
   "main": "index.js",
   "repository": {

server/config/default-test.json5

@@ -1,6 +1,7 @@
 {
   logDir: '',
   serviceName: {
+    system: 'deighton-ar-test',
     server: 'dar-test-server',
     api: 'dar-test-api',
     email: 'dar-test-email',

server/config/default.json5

@@ -1,6 +1,7 @@
 {
   logDir: '',
   serviceName: {
+    system: 'deighton-ar',
     server: 'dar-server',
     api: 'dar-api',
     email: 'dar-email',

server/package-lock.json

@@ -5987,6 +5987,11 @@
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
+    "sleep-promise": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/sleep-promise/-/sleep-promise-6.0.0.tgz",
+      "integrity": "sha1-qAtMPCbtVTxzydtyNLwDBPfULUo="
+    },
     "sliced": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",

server/package.json

@@ -7,7 +7,7 @@
     "start": "babel-node src/server.js",
     "start:prod": "NODE_ENV=production node dist/server.js",
     "build": "rm -rf dist && babel src -d dist -s",
-    "deploy": "rsync -vr -e ssh --exclude-from .rsync-exclude * $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-server/ && ssh $SNAP_DEPLOY_USER@$SNAP_DEPLOYHOST 'cd deighton-ar-server && npm install & sudo ./ops restart & sudo ./ops --test restart'",
+    "deploy": "rsync -vr -e ssh --exclude-from .rsync-exclude * $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-server/ && ssh $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST 'cd deighton-ar-server; npm install; sudo ./ops restart; sudo ./ops --test restart'",
     "test": "jest",
     "actor:api": "monzilla 'src/api/**/*.js:src/database/**/*.js' -- babel-node src/api/index.js",
     "actor:api:debug": "babel-node --inspect-brk src/api/index.js",
@@ -48,6 +48,7 @@
     "redis": "^2.7.1",
     "redis-rstream": "^0.1.3",
     "regexp-pattern": "^1.0.4",
+    "sleep-promise": "^6.0.0",
     "socket.io": "^2.0.3",
     "tmp-promise": "^1.0.4",
     "urlsafe-base64": "^1.0.0",

server/src/version.js

@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.0',
+  version: '1.0.1',
-  fullVersion: '1.0.0-20180516.0',
+  fullVersion: '1.0.1-20180518.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',

version.json5

@@ -16,10 +16,10 @@
   tags: {
     major: 1,
     minor: 0,
-    patch: 0,
+    patch: 1,
-    build: 20180516,
+    build: 20180518,
     revision: 0,
-    sequence: 3,
+    sequence: 4,
     tz: "America/Los_Angeles",
     title: "Deighton AR System",
     copyright: "© 2018, Kingston Software Solutions.",

website/package.json

@@ -62,7 +62,7 @@
   "scripts": {
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
-    "deploy": "rsync -vr -e ssh build/* ubuntu@gs-1:deighton-ar-website/",
+    "deploy": "rsync -vr -e ssh build/* $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-website/",
     "lint": "eslint --ext .js --ext .jsx src/",
     "lint:fix": "eslint --ext .js --ext .jsx --fix src/"
   },

website/src/version.js

@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.0',
+  version: '1.0.1',
-  fullVersion: '1.0.0-20180516.0',
+  fullVersion: '1.0.1-20180518.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',