config-mgmt/salt-states
0
0
Fork 0
Code Releases Activity

restic formula rewrite and gitea updates

Browse Source
This commit is contained in:
Keiran Snowden
2023-11-26 21:56:18 -05:00
parent 0bb12fde34
commit 3de878dd20
13 changed files with 154 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gitea/app_defaults.yaml
View File

@@ -2,6 +2,7 @@ global:
APP_NAME: 'Gitea: Git with a cup of tea'
RUN_USER: gitea
RUN_MODE: prod
WORK_PATH: gitea
sections:
database:
DB_TYPE: mysql

72
gitea/files/app_ini.jinja
View File

@@ -1,35 +1,45 @@
# Managed by salt
{% import_yaml 'gitea/app_defaults.yaml' as defaults -%}
{% set secrets = salt.file.read(pillar['gitea']['path'] + '/etc/secrets.json') | load_json -%}
{% set pillar_global = salt.pillar.get('gitea:config:global', {}) -%}
{% set pillar_sections = salt.pillar.get('gitea:config:sections', {}) -%}
{%- import_yaml 'gitea/app_defaults.yaml' as defaults %}
{%- set secrets = salt.file.read(pillar['gitea']['path'] + '/etc/secrets.json') | load_json %}
{%- set pillar_global = salt.pillar.get('gitea:config:global', {}) %}
{%- set pillar_sections = salt.pillar.get('gitea:config:sections', {}) %}
{%- for key in defaults['global'].keys() %}
{%- if key in pillar_global %}
{{ key }} = {{ pillar_global[key] }}
{%- else %}
{{ key }} = {{ defaults['global'][key] }}
{%- endif %}
{%- endfor %}
{%- for key, val in pillar_global.items() %}
{%- if key not in defaults['global'] %}
{{ key }} = {{ val }}
{%- endif %}
{%- endfor %}
{% for key in defaults['global'].keys() -%}
{% if key in pillar_global -%}
{{key}} = {{pillar_global[key]}}
{% else -%}
{{key}} = {{defaults['global'][key]}}
{% endif -%}
{% endfor %}
[security]
INTERNAL_TOKEN = {{secrets['INTERNAL_TOKEN']}}
INSTALL_LOCK = true
SECRET_KEY = {{secrets['SECRET_KEY']}}
INTERNAL_TOKEN = {{ secrets['INTERNAL_TOKEN'] }}
INSTALL_LOCK = true
SECRET_KEY = {{ secrets['SECRET_KEY'] }}
{% for section in defaults['sections'].keys() -%}
[{{section}}]
{% if section == 'server' -%}
LFS_JWT_SECRET = {{secrets['LFS_JWT_SECRET']}}
{% elif section == 'database' -%}
NAME = {{pillar_sections['database']['NAME']}}
USER = {{pillar_sections['database']['USER']}}
PASSWD = `{{pillar_sections['database']['PASSWD']}}`
{% endif -%}
{% for key in defaults['sections'][section] -%}
{% if section in pillar_sections and key in pillar_sections[section] -%}
{{key.ljust(33)}} = {{pillar_sections[section][key]}}
{% else -%}
{{key.ljust(33)}} = {{defaults['sections'][section][key]}}
{% endif -%}
{% endfor %}
{% endfor -%}
{%- for section in defaults['sections'].keys() %}
[{{ section }}]
{%- if section == 'server' %}
LFS_JWT_SECRET = {{ secrets['LFS_JWT_SECRET'] }}
{%- elif section == 'database' %}
NAME = {{ pillar_sections['database']['NAME'] }}
USER = {{ pillar_sections['database']['USER'] }}
PASSWD = `{{ pillar_sections['database']['PASSWD'] }}`
{%- endif %}
{%- for key in defaults['sections'][section] %}
{%- if section in pillar_sections and key in pillar_sections[section] %}
{{ key }} = {{pillar_sections[section][key]}}
{%- else %}
{{ key }} = {{defaults['sections'][section][key]}}
{%- endif %}
{%- endfor %}
{%- endfor %}
[oauth2]
JWT_SECRET = {{ pillar_sections['oauth2']['JWT_SECRET'] }}