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

fix: Complete migration to libtofsstack

Browse Source
This commit is contained in:
jeanluc
2023-06-13 11:28:00 +02:00
parent 1603e4e5d8
commit e322c077b0
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gitea/mods/rst/clean.sls
View File

@@ -8,7 +8,6 @@
{%- set tplroot = tpldir.split("/")[0] %} {%- set tplroot = tpldir.split("/")[0] %}
{%- set sls_config_file = tplroot ~ ".config.file" %} {%- set sls_config_file = tplroot ~ ".config.file" %}
{%- from tplroot ~ "/map.jinja" import mapdata as gitea with context %} {%- from tplroot ~ "/map.jinja" import mapdata as gitea with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
Gitea RST external renderer is absent: Gitea RST external renderer is absent:
file.absent: file.absent:

8
gitea/mods/rst/init.sls
View File

@@ -12,7 +12,7 @@
{%- set sls_config_file = tplroot ~ ".config.file" %} {%- set sls_config_file = tplroot ~ ".config.file" %}
{%- set sls_go_install = tplroot ~ ".go" %} {%- set sls_go_install = tplroot ~ ".go" %}
{%- from tplroot ~ "/map.jinja" import mapdata as gitea with context %} {%- from tplroot ~ "/map.jinja" import mapdata as gitea with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} {%- from tplroot ~ "/libtofsstack.jinja" import files_switch with context %}
include: include:
- {{ sls_go_install }} - {{ sls_go_install }}
@@ -59,9 +59,11 @@ Chroma is installed:
RST external renderer is installed: RST external renderer is installed:
file.managed: file.managed:
- name: {{ gitea.lookup.mod_rst.path }} - name: {{ gitea.lookup.mod_rst.path }}
- source: {{ files_switch(["grst"], - source: {{ files_switch(
["grst"],
config=gitea,
use_subpath=True, use_subpath=True,
lookup="RST external renderer is installed" lookup="RST external renderer is installed",
) )
}} }}
- mode: '0755' - mode: '0755'

8
gitea/package/install.sls
View File

@@ -2,7 +2,7 @@
{%- set tplroot = tpldir.split("/")[0] %} {%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/map.jinja" import mapdata as gitea with context %} {%- from tplroot ~ "/map.jinja" import mapdata as gitea with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} {%- from tplroot ~ "/libtofsstack.jinja" import files_switch with context %}
Gitea user/group is present: Gitea user/group is present:
user.present: user.present:
@@ -140,9 +140,11 @@ Gitea service unit is available:
file.managed: file.managed:
- name: {{ gitea.lookup.service.unit.format(name=gitea.lookup.service.name) }} - name: {{ gitea.lookup.service.unit.format(name=gitea.lookup.service.name) }}
- source: {{ files_switch( - source: {{ files_switch(
["gitea.service.j2"], ["gitea.service", "gitea.service.j2"],
config=gitea,
lookup="Gitea service unit is available", lookup="Gitea service unit is available",
) }} )
}}
- template: jinja - template: jinja
- mode: '0644' - mode: '0644'
- user: root - user: root