Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-07-26 07:55:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix: cacher client installation indentation

Browse source
This commit is contained in:
Ben Grande 2023-12-20 16:47:35 +01:00
parent a78b90e8bd
commit d3ae662c00
2 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

19
salt/sys-cacher/install-client.sls
View file

@ -7,17 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['os_family']|lower == 'debian' -%} {% if grains['os_family']|lower == 'debian' -%}
{% if not salt['file.file_exists']('/usr/share/whonix/marker') -%} {% if not salt['file.file_exists']('/usr/share/whonix/marker') -%}
{% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*(list|sources)') -%} {% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*(list|sources)') -%}
{{ repo }}_baseurl: "{{ repo }}_baseurl":
file.replace: file.replace:
- name: {{ repo }} - name: {{ repo }}
- pattern: 'https://' - pattern: 'https://'
- repl: 'http://HTTPS///' - repl: 'http://HTTPS///'
- flags: [ 'IGNORECASE', 'MULTILINE' ] - flags: [ 'IGNORECASE', 'MULTILINE' ]
- backup: False - backup: False
{% endfor -%} {% endfor -%}
/etc/apt/sources.list: "/etc/apt/sources.list":
file.replace: file.replace:
- name: /etc/apt/sources.list - name: /etc/apt/sources.list
- pattern: 'https:' - pattern: 'https:'
@ -27,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% endif -%} {% endif -%}
{% elif grains['os_family']|lower == 'arch' -%} {% elif grains['os_family']|lower == 'arch' -%}
pacman: "pacman":
file.replace: file.replace:
- names: - names:
- /etc/pacman.d/mirrorlist - /etc/pacman.d/mirrorlist
@ -39,29 +38,31 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% elif grains['os_family']|lower == 'redhat' -%} {% elif grains['os_family']|lower == 'redhat' -%}
{% for repo in salt['file.find']('/etc/yum.repos.d/', name='*repo') -%} {% for repo in salt['file.find']('/etc/yum.repos.d/', name='*repo') -%}
{{ repo }}_baseurl: "{{ repo }}_baseurl":
file.replace: file.replace:
- name: {{ repo }} - name: {{ repo }}
- pattern: 'baseurl(.*)https://' - pattern: 'baseurl(.*)https://'
- repl: 'baseurl\1http://HTTPS///' - repl: 'baseurl\1http://HTTPS///'
- flags: [ 'IGNORECASE', 'MULTILINE' ] - flags: [ 'IGNORECASE', 'MULTILINE' ]
- backup: False - backup: False
{{ repo }}_metalink:
"{{ repo }}_metalink":
file.replace: file.replace:
- name: {{ repo }} - name: {{ repo }}
- pattern: 'metalink=https://(.*)' - pattern: 'metalink=https://(.*)'
- repl: 'metalink=http://HTTPS///\1' - repl: 'metalink=http://HTTPS///\1'
- flags: [ 'IGNORECASE', 'MULTILINE' ] - flags: [ 'IGNORECASE', 'MULTILINE' ]
- backup: False - backup: False
{% endfor -%} {% endfor -%}
{% for repo in salt['file.find']('/etc/yum.repos.d/', name='rpmfusion*repo*') -%} {% for repo in salt['file.find']('/etc/yum.repos.d/', name='rpmfusion*repo*') -%}
{{ repo }}_uncomment: "{{ repo }}_uncomment":
file.uncomment: file.uncomment:
- name: {{ repo }} - name: {{ repo }}
- regex: '.*baseurl(.*)' - regex: '.*baseurl(.*)'
- backup: False - backup: False
{{ repo }}_comment:
"{{ repo }}_comment":
file.comment: file.comment:
- name: {{ repo }} - name: {{ repo }}
- regex: '^metalink=http(.*)' - regex: '^metalink=http(.*)'

10
salt/sys-cacher/uninstall-client.sls
View file

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['os_family']|lower == 'debian' -%} {% if grains['os_family']|lower == 'debian' -%}
{% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*(list|sources)') -%} {% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*(list|sources)') -%}
{{ repo }}_baseurl: "{{ repo }}_baseurl":
file.replace: file.replace:
- name: {{ repo }} - name: {{ repo }}
- pattern: 'http://HTTPS/' - pattern: 'http://HTTPS/'
@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- backup: False - backup: False
{% endfor -%} {% endfor -%}
/etc/apt/sources.list: "/etc/apt/sources.list":
file.replace: file.replace:
- name: /etc/apt/sources.list - name: /etc/apt/sources.list
- pattern: 'http://HTTPS/' - pattern: 'http://HTTPS/'
@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- backup: False - backup: False
{% elif grains['os_family']|lower == 'arch' -%} {% elif grains['os_family']|lower == 'arch' -%}
pacman: "pacman":
file.replace: file.replace:
- names: - names:
- /etc/pacman.d/mirrorlist - /etc/pacman.d/mirrorlist
@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% elif grains['os_family']|lower == 'redhat' -%} {% elif grains['os_family']|lower == 'redhat' -%}
{% for repo in salt['file.find']('/etc/yum.repos.d/', name='*repo*') -%} {% for repo in salt['file.find']('/etc/yum.repos.d/', name='*repo*') -%}
{{ repo }}_baseurl: "{{ repo }}_baseurl":
file.replace: file.replace:
- name: {{ repo }} - name: {{ repo }}
- pattern: 'baseurl(.*)http://HTTPS/' - pattern: 'baseurl(.*)http://HTTPS/'
@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- flags: [ 'IGNORECASE', 'MULTILINE' ] - flags: [ 'IGNORECASE', 'MULTILINE' ]
- backup: False - backup: False
{{ repo }}_metalink: "{{ repo }}_metalink":
file.replace: file.replace:
- name: {{ repo }} - name: {{ repo }}
- pattern: 'metalink=http://HTTPS///(.*)' - pattern: 'metalink=http://HTTPS///(.*)'