From f5324546129fbd98e42ca98811c34cf23bda40d3 Mon Sep 17 00:00:00 2001 From: crystal Date: Mon, 29 Apr 2024 01:52:58 -0600 Subject: [PATCH] change GITEA_ to FORGEJO_ in env vars --- .ci-make.sh | 4 ++-- deb/forgejo.service | 2 +- etc/systemd/system/forgejo.service.d/override.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-make.sh b/.ci-make.sh index 5e471ab..8755a80 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -186,7 +186,7 @@ case "$1" in [ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo [ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo sudo -u $FORGEJO_USER USER=$FORGEJO_USER \ - HOME=$FORGEJO_HOME GITEA_WORK_DIR=$FORGEJO_HOME \ + HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \ forgejo web -q --config /etc/forgejo/app.ini & sleep 10 curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" @@ -202,7 +202,7 @@ case "$1" in apt update -qq apt install -y "$3" sudo -u forgejo USER=forgejo \ - HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \ + HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo \ forgejo web -q --config /etc/fogejo/app.ini & sleep 10 curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" diff --git a/deb/forgejo.service b/deb/forgejo.service index 008d93e..c5f3bc8 100644 --- a/deb/forgejo.service +++ b/deb/forgejo.service @@ -61,7 +61,7 @@ WorkingDirectory=~ #RuntimeDirectory=forgejo ExecStart=/usr/bin/forgejo web --config /etc/forgejo/app.ini Restart=always -Environment=USER=forgejo HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo +Environment=USER=forgejo HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo # If you install Git to directory prefix other than default PATH (which happens # for example if you install other versions of Git side-to-side with # distribution version), uncomment below line and add that prefix to PATH diff --git a/etc/systemd/system/forgejo.service.d/override.conf b/etc/systemd/system/forgejo.service.d/override.conf index f626df8..02635f5 100644 --- a/etc/systemd/system/forgejo.service.d/override.conf +++ b/etc/systemd/system/forgejo.service.d/override.conf @@ -3,4 +3,4 @@ # LimitNOFILE=524288:524288 User=git Group=git -Environment=USER=git HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo +Environment=USER=git HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo