karel/salt-gitea-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): Include custom configuration in global file

Browse Source 
Previously, this formula generated two configuration files,
a global one for database and secrets setup and
a custom one for all other settings in `custom/conf/app.ini`.

This did not work as intended.
This commit is contained in:
jeanluc
2022-05-10 13:27:01 +02:00
parent d21bbac35c
commit 670dc9c945
35 changed files with 398 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gitea/files/default/etc/app.ini.j2
View File

@@ -1,24 +0,0 @@
;; Global Gitea configuration managed by salt state.
;; These values are necessary to skip the web installer.
[database]
{%- for conf, val in gitea.database.items() %}
{{ conf | upper }} = {{ val if conf | upper != 'PASSWD' else '`{}`'.format(val) }}
{%- endfor %}
{#- The following secrets are guaranteed to be set by `post-map.jinja`. #}
[oauth2]
JWT_SECRET = {{ gitea.secrets.jwt_secret }}
[security]
INSTALL_LOCK = true
{%- if gitea.secrets.internal_token %}
INTERNAL_TOKEN = {{ gitea.secrets.internal_token }}
{%- else %}
INTERNAL_TOKEN_URI = {{ gitea.lookup.paths.internal_token_uri }}
{%- endif %}
SECRET_KEY = {{ gitea.secrets.secret_key }}
[server]
LFS_JWT_SECRET = {{ gitea.secrets.lfs_jwt_secret }}