changeset 2116:059afc92310b ssltesting

split update.sh
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 05 Jan 2026 14:02:55 -0700
parents 5b434c8a27bd
children 1e247cd012ee
files host/update.sh host/update2.sh
diffstat 2 files changed, 27 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/host/update.sh	Mon Dec 22 18:54:30 2025 -0800
+++ b/host/update.sh	Mon Jan 05 14:02:55 2026 -0700
@@ -1,37 +1,9 @@
 #!/bin/bash
-
 set -e
-# prevents error if there is nothing in sites/
-shopt -s nullglob
-
-SCRIPT_DIR="$(cd -- "$(dirname -- "$0")" && pwd)"
-cd $SCRIPT_DIR
 
 ./stop.sh
 
 echo Updating hg
 hg pull -u
 
-../scripts/build-luan.sh
-
-mkdir -p local
-mkdir -p logs
-rm -f logs/*
-hg identify >logs/changeset.txt
-
-if [ ! -f local/tiny_account.key ]; then
-	echo "Register letsencrypt (tiny-acme)"
-	openssl genrsa 4096 >local/tiny_account.key
-fi
-
-cp startup/nginx/mime.types local/mime.types
-# id -gn gets the name of the primary group of the current user (staff)
-luan startup/nginx/nginx.conf.luan $(pwd) $(whoami) $(id -gn) >local/nginx.conf
-luan startup/nginx/nginx.default.conf.luan $(pwd) >local/nginx.default.conf
-
-# this is done because the nginx conf uses absolute paths
-# and this breaks sites when the luan/host directory is moved
-luan classpath:luan/host/update.luan
-
-echo Starting...
-./start.sh
+./update2.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/host/update2.sh	Mon Jan 05 14:02:55 2026 -0700
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+../scripts/build-luan.sh
+
+mkdir -p local
+mkdir -p logs
+rm -f logs/*
+hg identify >logs/changeset.txt
+
+if [ ! -f local/tiny_account.key ]; then
+	echo "Register letsencrypt (tiny-acme)"
+	openssl genrsa 4096 >local/tiny_account.key
+fi
+
+cp startup/nginx/mime.types local/mime.types
+# id -gn gets the name of the primary group of the current user (staff)
+luan startup/nginx/nginx.conf.luan $(pwd) $(whoami) $(id -gn) >local/nginx.conf
+luan startup/nginx/nginx.default.conf.luan $(pwd) >local/nginx.default.conf
+
+# this is done because the nginx conf uses absolute paths
+# and this breaks sites when the luan/host directory is moved
+luan classpath:luan/host/update.luan
+
+echo Starting...
+./start.sh