diff --git a/bin/deploy.sh b/bin/deploy.sh index 94a2bd26..15778cd7 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -8,30 +8,25 @@ VERSION=$(<"$MNML_PATH/VERSION") SERVER_BIN_DIR="/usr/local/mnml/bin" CLIENT_DIST_DIR="/var/lib/mnml/client" -CLIENT_PUBLIC_DIR="/var/lib/mnml/public/client" +CLIENT_PUBLIC_DIR="/var/lib/mnml/public/current" -ACP_DIST_DIR="/var/lib/mnml/acp" -ACP_PUBLIC_DIR="/var/lib/mnml/public/acp" +TARGET=$1 + +echo "syncing server $VERSION to $TARGET" # server updates echo "syncing server $VERSION " -rsync -a --delete --delete-excluded "$MNML_PATH/server/target/release/mnml" mnml:"$SERVER_BIN_DIR/$VERSION" -ssh -q mnml ln -nfs "$SERVER_BIN_DIR/$VERSION" "$SERVER_BIN_DIR/mnml" -ssh -q mnml ls -lah "$SERVER_BIN_DIR" +rsync -a --delete --delete-excluded "$MNML_PATH/server/target/release/mnml" "$TARGET:$SERVER_BIN_DIR/$VERSION" +ssh -q "$TARGET" ln -nfs "$SERVER_BIN_DIR/$VERSION" "$SERVER_BIN_DIR/mnml" +ssh -q "$TARGET" ls -lah "$SERVER_BIN_DIR" # client updates echo "syncing client $VERSION" -rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" mnml:"$CLIENT_DIST_DIR/$VERSION/" -ssh -q mnml ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR" - -# acp updates -echo "syncing acp $VERSION" -rsync -a --delete --delete-excluded "$MNML_PATH/acp/dist/" mnml:"$ACP_DIST_DIR/$VERSION/" -ssh -q mnml ln -nfs "$ACP_DIST_DIR/$VERSION" "$ACP_PUBLIC_DIR" -ssh -q mnml ls -lah "/var/lib/mnml/public" +rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" "$TARGET:$CLIENT_DIST_DIR/$VERSION/" +ssh -q "$TARGET" ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR" echo "restarting mnml service" -ssh -q -t mnml sudo service mnml restart && sleep 1 && systemctl --no-pager status mnml +ssh -q -t "$TARGET" sudo service mnml restart && sleep 1 && systemctl --no-pager status mnml echo "restarting nginx service" -ssh -q -t mnml sudo service nginx restart && sleep 1 && systemctl --no-pager status nginx +ssh -q -t "$TARGET" sudo service nginx restart && sleep 1 && systemctl --no-pager status nginx diff --git a/etc/mnml/server.SAMPLE.conf b/etc/mnml/server.SAMPLE.conf new file mode 100644 index 00000000..948f72fc --- /dev/null +++ b/etc/mnml/server.SAMPLE.conf @@ -0,0 +1 @@ +DATABASE_URL=postgres://mnml:password@somewhere/mnml \ No newline at end of file diff --git a/etc/systemd/system/mnml.service b/etc/systemd/system/mnml.service index fd859f8d..1fb13097 100644 --- a/etc/systemd/system/mnml.service +++ b/etc/systemd/system/mnml.service @@ -1,6 +1,5 @@ [Unit] Description=mnml game server -After=postgresql User=mnml [Service]