Linting #33
@ -23,7 +23,7 @@ profile:
 | 
			
		||||
            NickServNick: viaduct
 | 
			
		||||
            NickServPassword: ${'secret_matterbridge:general:accounts:irc.libertacasa:NickServPassword'}
 | 
			
		||||
            ColorNicks: 'true'
 | 
			
		||||
            Charset: utf8 
 | 
			
		||||
            Charset: utf8
 | 
			
		||||
            MessageSplit: 'true'
 | 
			
		||||
            MessageQueue: 60
 | 
			
		||||
            UseRelayMsg: 'true'
 | 
			
		||||
 | 
			
		||||
@ -412,7 +412,7 @@ nginx:
 | 
			
		||||
            - location /:
 | 
			
		||||
                - proxy_pass: http://media.takahe.rigel.lysergic.dev:8001
 | 
			
		||||
                {{ takaheresolver }}
 | 
			
		||||
          {#- despair.life is a second entry-point to social.liberta.casa instead of only a secondary domain in Takahe #} 
 | 
			
		||||
          {#- despair.life is a second entry-point to social.liberta.casa instead of only a secondary domain in Takahe #}
 | 
			
		||||
          - server:
 | 
			
		||||
            {{ takahe_includes() }}
 | 
			
		||||
            - server_name: despair.life
 | 
			
		||||
@ -436,7 +436,7 @@ nginx:
 | 
			
		||||
              - snippets/error
 | 
			
		||||
            - server_name: exhausted.life
 | 
			
		||||
            {{ takahe_gohome() }}
 | 
			
		||||
            - location /.well-known/: 
 | 
			
		||||
            - location /.well-known/:
 | 
			
		||||
                - proxy_pass: {{ backend.takahe }}
 | 
			
		||||
                - sub_filter_types: application/xml
 | 
			
		||||
                - sub_filter: takahe.rigel.lysergic.dev:8000 exhausted.life
 | 
			
		||||
 | 
			
		||||
@ -46,7 +46,7 @@ matterbridge_{{ instance }}_mediadir:
 | 
			
		||||
    - user: matterbridge
 | 
			
		||||
    {#- to-do: implement some shared group #}
 | 
			
		||||
    - group: lighttpd
 | 
			
		||||
    - mode: 750
 | 
			
		||||
    - mode: '0750'
 | 
			
		||||
    - makedirs: True
 | 
			
		||||
{%- endif %}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -5,6 +5,6 @@ include:
 | 
			
		||||
  file.managed:
 | 
			
		||||
    - user: keepalived_script
 | 
			
		||||
    - group: wheel
 | 
			
		||||
    - mode: 750
 | 
			
		||||
    - mode: '0750'
 | 
			
		||||
    - template: jinja
 | 
			
		||||
    - source: salt://{{ slspath }}/files/failover.sh.j2
 | 
			
		||||
 | 
			
		||||
@ -17,7 +17,7 @@ salt_master_extension_modules_dirs:
 | 
			
		||||
      {%- endfor %}
 | 
			
		||||
    - user: root
 | 
			
		||||
    - group: salt
 | 
			
		||||
    - mode: 0755
 | 
			
		||||
    - mode: '0755'
 | 
			
		||||
 | 
			
		||||
salt_master_extension_modules_bins:
 | 
			
		||||
  file.managed:
 | 
			
		||||
@ -30,7 +30,7 @@ salt_master_extension_modules_bins:
 | 
			
		||||
      {%- endfor %}
 | 
			
		||||
    - user: root
 | 
			
		||||
    - group: salt
 | 
			
		||||
    - mode: 0640
 | 
			
		||||
    - mode: '0640'
 | 
			
		||||
    - require:
 | 
			
		||||
      - file: salt_master_extension_modules_dirs
 | 
			
		||||
 | 
			
		||||
@ -72,7 +72,7 @@ salt_master_extra_packages:
 | 
			
		||||
      - requirepass {{ master_pillar['cache.redis.password'] }}
 | 
			
		||||
    - user: root
 | 
			
		||||
    - group: redis
 | 
			
		||||
    - mode: 0640
 | 
			
		||||
    - mode: '0640'
 | 
			
		||||
    - require:
 | 
			
		||||
      - pkg: redis
 | 
			
		||||
 | 
			
		||||
@ -80,7 +80,7 @@ salt_master_extra_packages:
 | 
			
		||||
  file.directory:
 | 
			
		||||
    - user: redis
 | 
			
		||||
    - group: redis
 | 
			
		||||
    - mode: 0750
 | 
			
		||||
    - mode: '0750'
 | 
			
		||||
    - require:
 | 
			
		||||
      - pkg: redis
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,7 @@
 | 
			
		||||
{%- set netbox_pillar = salt['pillar.get']('netbox') -%}
 | 
			
		||||
{%- if 'custom_fields' in netbox_pillar and netbox_pillar['custom_fields']['salt_roles'] is not none and 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%}
 | 
			
		||||
{%- if 'custom_fields' in netbox_pillar
 | 
			
		||||
    and netbox_pillar['custom_fields']['salt_roles'] is not none
 | 
			
		||||
    and 'salt.syndic' in netbox_pillar['custom_fields']['salt_roles'] -%}
 | 
			
		||||
{%- set master = salt['pillar.get']('salt:master:syndic_master') -%}
 | 
			
		||||
{%- elif 'config_context' in netbox_pillar -%}
 | 
			
		||||
{%- set master = netbox_pillar['config_context']['salt_master'] -%}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user