diff options
| -rw-r--r-- | pillar/id/dericom02_rigel_lysergic_dev.sls | 34 | ||||
| -rw-r--r-- | pillar/id/deriweb01_rigel_lysergic_dev.sls | 12 | ||||
| -rw-r--r-- | salt/profile/salt/formulas.sls | 6 | ||||
| -rw-r--r-- | salt/profile/salt/master.sls | 8 |
4 files changed, 47 insertions, 13 deletions
diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls index 51a487e..4cc5145 100644 --- a/pillar/id/dericom02_rigel_lysergic_dev.sls +++ b/pillar/id/dericom02_rigel_lysergic_dev.sls @@ -69,6 +69,7 @@ profile: lucy: irc.libertacasa: '#lucy' xmpp.libertacasa: lucy + telegram.libertacasa: '-1001795702961' info: irc.libertacasa: '#libcasa.info' xmpp.libertacasa: libcasa.info @@ -224,6 +225,36 @@ profile: irc.chillnet: '#music' irc.stardust: '#music' + chillnet: + general: + MediaDownloadSize: 1000000000 + MediaDownloadPath: {{ mediapath }}chillnet + MediaServerDownload: https://uploads.chillnet.org + accounts: + irc.chillnet: + Server: irc.chillnet.org:6697 + UseTLS: 'true' + UseSASL: 'true' + Nick: viaduct + NickServNick: viaduct + NickServPassword: ${'secret_matterbridge:chillnet:accounts:irc.chillnet:NickServPassword'} + ColorNicks: 'true' + Charset: utf8 + MessageSplit: 'true' + MessageQueue: 60 + UseRelayMsg: 'true' + RemoteNickFormat: '{NICK}/{LABEL}' + telegram.chillnet: + Token: ${'secret_matterbridge:chillnet:accounts:telegram.chillnet:Token'} + RemoteNickFormat: '<{NICK}> ' + MessageFormat: HTMLNick + Label: tg + DisableWebPagePreview: 'true' + gateways: + fightclub: + irc.chillnet: '#fightclub' + telegram.chillnet: '-1001932699309' + lighttpd: vhosts: matterbridge-general: @@ -232,6 +263,9 @@ profile: matterbridge-irc: host: 'libertacasa-irc\.matterbridge\.dericom02\.rigel\.lysergic\.dev' root: {{ mediapath }}libertacasa-irc + matterbridge-chillnet: + host: 'chillnet\.matterbridge\.dericom02\.rigel\.lysergic\.dev' + root: {{ mediapath }}chill firewalld: zones: diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls index 77b553a..a0ed675 100644 --- a/pillar/id/deriweb01_rigel_lysergic_dev.sls +++ b/pillar/id/deriweb01_rigel_lysergic_dev.sls @@ -44,15 +44,15 @@ - proxy_set_header: Host $http_host - resolver: '{{ resolver }} ipv4=off valid=24h' {%- endmacro -%} -{%- macro matterbridge_media(name) -%} +{%- macro matterbridge_media(domain, name) -%} - server: - include: - snippets/listen - snippets/tls_load - snippets/tls - - server_name: {% if name == 'general' %}load.casa{%- else %}{{ name ~ '.load.casa' }}{%- endif %} + - server_name: {{ domain }} - location /: - - proxy_pass: http://libertacasa-{{ name }}.matterbridge.dericom02.rigel.lysergic.dev + - proxy_pass: http://{{ name }}.matterbridge.dericom02.rigel.lysergic.dev {%- endmacro -%} nginx: @@ -316,9 +316,9 @@ nginx: matterbridge.conf: config: - {{ matterbridge_media('general') }} - {{ matterbridge_media('irc') }} - + {{ matterbridge_media('load.casa', 'libertacasa-general') }} + {{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }} + {{ matterbridge_media('uploads.chillnet.org', 'chillnet') }} meet.conf: config: - server: diff --git a/salt/profile/salt/formulas.sls b/salt/profile/salt/formulas.sls new file mode 100644 index 0000000..d496e68 --- /dev/null +++ b/salt/profile/salt/formulas.sls @@ -0,0 +1,6 @@ +salt_master_formulas: + git.latest: + - name: https://git.com.de/LibertaCasa/salt-formulas.git + - target: /srv/formulas + - branch: production + - submodules: True diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls index f0fdc7c..58f8cc8 100644 --- a/salt/profile/salt/master.sls +++ b/salt/profile/salt/master.sls @@ -7,6 +7,7 @@ include: - salt.master + - .formulas salt_master_extension_modules_dirs: file.directory: @@ -34,13 +35,6 @@ salt_master_extension_modules_bins: - require: - file: salt_master_extension_modules_dirs -salt_master_formulas: - git.latest: - - name: https://git.com.de/LibertaCasa/salt-formulas.git - - target: /srv/formulas - - branch: production - - submodules: True - salt_master_extra_packages: pkg.installed: - names: |