From f2662027a8a76c89138f82e1068ee04c5860ab68 Mon Sep 17 00:00:00 2001 From: Jens Bodal Date: Tue, 24 Sep 2024 04:50:43 -0700 Subject: [PATCH 1/3] Update changedetection-install.sh (#3778) The path to this file changed a while back: https://github.com/browserless/browserless/pull/3723/files#diff-81165fc8abb0ab49496bbf329e9efeedc7df0e667f85b4dcfa5c77f6f2c2e799 --- install/changedetection-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index d42c5bb32..ab799611c 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -144,7 +144,7 @@ Environment=NODE_ENV=production Environment=PORT=3000 Environment=WORKSPACE_DIR=/opt/browserless/workspace WorkingDirectory=/opt/browserless -ExecStart=/opt/browserless/start.sh +ExecStart=/opt/browserless/scripts/start.sh SyslogIdentifier=browserless [Install] WantedBy=default.target From 5f34c2c7c892da46a902853f7c1640243a2c6133 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:18:21 +0200 Subject: [PATCH 2/3] Tweak for Zipline (#3779) Zipline is sensitiv with special characters --- install/zipline-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/zipline-install.sh b/install/zipline-install.sh index 1c444f8e3..2c47d0351 100644 --- a/install/zipline-install.sh +++ b/install/zipline-install.sh @@ -39,8 +39,8 @@ msg_ok "Installed Node.js" msg_info "Setting up PostgreSQL" DB_NAME=ziplinedb DB_USER=zipline -DB_PASS="$(openssl rand -base64 18 | cut -c1-13)" -SECRET_KEY="$(openssl rand -base64 32 | cut -c1-24)" +DB_PASS="$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)" +SECRET_KEY="$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-13)" $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';" $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER ENCODING 'UTF8' TEMPLATE template0;" $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8';" From 4ead590cf46585069d6b71ec34ebdb4c062cdc70 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Thu, 26 Sep 2024 13:06:07 +0200 Subject: [PATCH 3/3] Tweak for Tianji Update Script (#3794) --- ct/tianji.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ct/tianji.sh b/ct/tianji.sh index f22eaddb4..c58e739de 100644 --- a/ct/tianji.sh +++ b/ct/tianji.sh @@ -68,7 +68,8 @@ if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_v msg_info "Updating ${APP} to ${RELEASE}" cd /opt/tianji - git checkout -q v${RELEASE} + git checkout -f -q v${RELEASE} + cd src/server pnpm db:migrate:apply >/dev/null 2>&1 echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}"