diff options
| author | crystal <crystal@noreply.codeberg.org> | 2023-11-25 17:12:14 -0700 |
|---|---|---|
| committer | crystal <crystal@noreply.codeberg.org> | 2023-11-25 17:12:14 -0700 |
| commit | 7e75283801bced3535dd5f1e3c7027f872433364 (patch) | |
| tree | 1df847976ba7a8e2c969dfff6a6dec109dba8884 | |
| parent | e27c8710387cf48e1e77eafcdc02b3b9a3c526c8 (diff) | |
Fix data directory chmod
| -rwxr-xr-x | .ci-make.sh | 13 | ||||
| -rw-r--r-- | .crystalintegration.yml | 3 | ||||
| -rw-r--r-- | deb/debian/changelog | 1 | ||||
| -rw-r--r-- | deb/debian/forgejo.preinst | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/.ci-make.sh b/.ci-make.sh index 672c2a7..1c35250 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -129,5 +129,18 @@ case "$1" in curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" exit $? ;; + "verify-data-dir-chmod") + $DATA_DIR_CHMOD="$(stat -c %a /var/lib/forgejo)" + if [ "$DATA_DIR_CHMOD" = "750" ]; then + exit 0 + else + exit 100 + fi + ;; + "force-clean-forgejo") + apt install -y psmisc + killall forgejo + exit $? + ;; esac diff --git a/.crystalintegration.yml b/.crystalintegration.yml index 150e48c..b1dd5d4 100644 --- a/.crystalintegration.yml +++ b/.crystalintegration.yml @@ -305,6 +305,9 @@ steps: group: pkg-test-5 commands: - ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite + - ./.ci-make.sh force-clean-forgejo + - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb + - ./.ci-make.sh verify-data-dir-chmod upload-crystalcommit: image: woodpeckerci/plugin-gitea-release diff --git a/deb/debian/changelog b/deb/debian/changelog index 2ce6d3a..fc41590 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -2,6 +2,7 @@ forgejo (1.20.5.1-0) unstable; urgency=medium * Forgejo version 1.20.5-1 * app.ini: Replaced example with blank default + * Change data directory mode to 750 * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-5-1 -- crystal <crystal@noreply.codeberg.org> Sat, 25 Nov 2023 23:40:00 +0000 diff --git a/deb/debian/forgejo.preinst b/deb/debian/forgejo.preinst index f2bb530..ccd9cd2 100644 --- a/deb/debian/forgejo.preinst +++ b/deb/debian/forgejo.preinst @@ -29,6 +29,6 @@ case "$1" in $FORGEJO_USER if ! dpkg-statoverride --list $FORGEJO_HOME >/dev/null ; then chown -R $FORGEJO_USER:$FORGEJO_GROUP $FORGEJO_HOME - chmod u=rwx,g=rwx,o= $FORGEJO_HOME + chmod u=rwx,g=rx,o= $FORGEJO_HOME fi esac |