Merge branch 'totp_fix' into 'master'

Preserve SECRET_KEY across restarts

Closes #2

See merge request !5
This commit is contained in:
dswd 2017-09-02 17:20:21 +00:00
commit c67b13585f

View file

@ -62,6 +62,11 @@ if ! [ -f /app/data/app.ini ]; then
cp /home/git/app.ini.template /app/data/app.ini cp /home/git/app.ini.template /app/data/app.ini
fi fi
if [ "$(crudini --get /app/data/app.ini security SECRET_KEY)" == "##SECRET_KEY" ]; then
echo "Generating new SECRET_KEY"
crudini --set "/app/data/app.ini" security SECRET_KEY $(pwgen -1 -s)
fi
# merge user config file # merge user config file
crudini --merge "/run/gitea/app.ini" < "/app/data/app.ini" crudini --merge "/run/gitea/app.ini" < "/app/data/app.ini"