mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-26 09:24:07 -05:00
Merge pull request '[GITEA] environment-to-ini fails if run as root' (#924) from earl-warren/forgejo:wip-env into forgejo-dependency
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/924
This commit is contained in:
commit
470ff32fea
1 changed files with 3 additions and 3 deletions
|
@ -48,11 +48,11 @@ if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then
|
||||||
chown ${USER}:git ${GITEA_CUSTOM}/conf/app.ini
|
chown ${USER}:git ${GITEA_CUSTOM}/conf/app.ini
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Replace app.ini settings with env variables in the form GITEA__SECTION_NAME__KEY_NAME
|
|
||||||
environment-to-ini --config ${GITEA_CUSTOM}/conf/app.ini
|
|
||||||
|
|
||||||
# only chown if current owner is not already the gitea ${USER}. No recursive check to save time
|
# only chown if current owner is not already the gitea ${USER}. No recursive check to save time
|
||||||
if ! [[ $(ls -ld /data/gitea | awk '{print $3}') = ${USER} ]]; then chown -R ${USER}:git /data/gitea; fi
|
if ! [[ $(ls -ld /data/gitea | awk '{print $3}') = ${USER} ]]; then chown -R ${USER}:git /data/gitea; fi
|
||||||
if ! [[ $(ls -ld /app/gitea | awk '{print $3}') = ${USER} ]]; then chown -R ${USER}:git /app/gitea; fi
|
if ! [[ $(ls -ld /app/gitea | awk '{print $3}') = ${USER} ]]; then chown -R ${USER}:git /app/gitea; fi
|
||||||
if ! [[ $(ls -ld /data/git | awk '{print $3}') = ${USER} ]]; then chown -R ${USER}:git /data/git; fi
|
if ! [[ $(ls -ld /data/git | awk '{print $3}') = ${USER} ]]; then chown -R ${USER}:git /data/git; fi
|
||||||
chmod 0755 /data/gitea /app/gitea /data/git
|
chmod 0755 /data/gitea /app/gitea /data/git
|
||||||
|
|
||||||
|
# Replace app.ini settings with env variables in the form GITEA__SECTION_NAME__KEY_NAME
|
||||||
|
su $USER -c "environment-to-ini --config ${GITEA_CUSTOM}/conf/app.ini"
|
||||||
|
|
Loading…
Reference in a new issue