Improved upload script

3 files changed, 34 insertions, 3 deletions

diff --git a/game.js b/game.js
index 8ee4586..0e77d9c 100644
--- a/game.js
+++ b/game.js
@@ -535,7 +535,6 @@ window.addEventListener('load', function () {
 				const parts = e.data.substring('useImage '.length).split(' ');
 				imageUrl = parts[0];
 				imageLink = parts.length > 1 ? parts[1] : imageUrl;
-				console.log(imageUrl);
 				hostPuzzle();
 			} else if (e.data.startsWith('error ')) {
 				const error = e.data.substring('error '.length);
diff --git a/server/jigsaw-server.service b/server/jigsaw-server.service
new file mode 100644
index 0000000..5bfaa9d
--- /dev/null
+++ b/server/jigsaw-server.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Jigsaw puzzle server
+After=network.target
+
+[Service]
+User=jigsaw
+WorkingDirectory=/home/jigsaw/server
+ExecStart=/home/jigsaw/server/jigsaw-server
+Type=simple
+Restart=always
+
+[Install]
+WantedBy=default.target
+RequiredBy=network.target
diff --git a/upload.sh b/upload.sh
index ba440d9..42d1483 100755
--- a/upload.sh
+++ b/upload.sh
@@ -1,9 +1,27 @@
 #!/bin/sh
+
+# Upload the site to the server
+
+# where rclone should put remote files
+RCLONE_DEST=${RCLONE_DEST:-linode:/s.pommicket.com/jigsaw}
+# server user+hostname
+REMOTE=${REMOTE:-jigsaw@pommicket.com}
 for file in *.html *.js *.css *.mp3; do
 	echo "upload $file"
-	rclone copy --s3-acl=public-read $file linode:/s.pommicket.com/jigsaw || exit 1
+	rclone copy --s3-acl=public-read $file $RCLONE_DEST || exit 1
 done
+
+# if static-only argument is given, exit now
+printf '%s' "$@" | grep -q 'static-only' && exit 0
+
 cd server
+echo 'Building server…'
 cargo build --release || exit 1
-scp target/release/jigsaw-server featuredpictures.txt potd.py getfeaturedpictures.py jigsaw@pommicket.com:server/
+echo 'Stopping server…'
+ssh $REMOTE sudo systemctl stop jigsaw-server.service  || exit 1
+echo 'Copying server files…'
+scp -C featuredpictures.txt potd.py getfeaturedpictures.py  target/release/jigsaw-server ${REMOTE}:server/  || exit 1
+echo 'Restarting server…'
+ssh $REMOTE sudo systemctl start jigsaw-server.service || exit 1
 cd ..
+echo 'Done!'