Sfoglia il codice sorgente

refactor(sls): align to template-formula: use tplroot

tags/v1.1.0
Benjamin Neff 4 anni fa
parent
commit
a3a19f5a05
Nessun account collegato all'indirizzo email del committer
4 ha cambiato i file con 24 aggiunte e 9 eliminazioni
  1. +6
    -1
      diaspora/config.sls
  2. +3
    -3
      diaspora/init.sls
  3. +7
    -2
      diaspora/install.sls
  4. +8
    -3
      diaspora/service.sls

+ 6
- 1
diaspora/config.sls Vedi File

{%- from "diaspora/map.jinja" import diaspora with context %}
# -*- coding: utf-8 -*-
# vim: ft=sls

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import diaspora with context %}


{{ diaspora.install_path }}/config/database.yml: {{ diaspora.install_path }}/config/database.yml:
file.managed: file.managed:

+ 3
- 3
diaspora/init.sls Vedi File

include: include:
- diaspora.install
- diaspora.config
- diaspora.service
- .install
- .config
- .service

+ 7
- 2
diaspora/install.sls Vedi File

{%- from "diaspora/map.jinja" import diaspora with context %}
# -*- coding: utf-8 -*-
# vim: ft=sls

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import diaspora with context %}
{%- set environment = diaspora.configuration.server.rails_environment %} {%- set environment = diaspora.configuration.server.rails_environment %}


include: include:
- diaspora.config
- {{ tplroot }}.config


{%- if grains.os == 'CentOS' and grains.osmajorrelease >= 8 %} {%- if grains.os == 'CentOS' and grains.osmajorrelease >= 8 %}
diaspora_centos_enable_powertools_repo: diaspora_centos_enable_powertools_repo:

+ 8
- 3
diaspora/service.sls Vedi File

{%- from "diaspora/map.jinja" import diaspora with context %}
# -*- coding: utf-8 -*-
# vim: ft=sls

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import diaspora with context %}


include: include:
- diaspora.install
- diaspora.config
- {{ tplroot }}.install
- {{ tplroot }}.config


/etc/systemd/system/diaspora-sidekiq.service: /etc/systemd/system/diaspora-sidekiq.service:
file.managed: file.managed:

Loading…
Annulla
Salva