config-mgmt/salt-states
0
0
Fork 0
Code Releases Activity

update from current

Browse Source
This commit is contained in:
Keiran Snowden
2025-12-27 18:46:18 -05:00
parent 1f59077a7f
commit 7247d0e25f
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_grains/lsusb.py
View File

@@ -1,6 +1,6 @@
import re import re
import logging import logging
from subprocess import check_output from subprocess import check_output, CalledProcessError
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -8,8 +8,8 @@ def main():
dev_re = re.compile(r"Bus\s+(\d+)\s+Device\s+(\d+):\s+ID\s(\w+:\w+)\s(.+)$") dev_re = re.compile(r"Bus\s+(\d+)\s+Device\s+(\d+):\s+ID\s(\w+:\w+)\s(.+)$")
try: try:
lsusb = check_output("lsusb", encoding='UTF-8') lsusb = check_output("lsusb", encoding='UTF-8')
except OSError as exc: except (CalledProcessError, OSError) as exc:
log.error(exc) log.debug(exc)
return {} return {}
devices = [] devices = []
corsair_aio = None corsair_aio = None

3
gitea/cpapache.sls
View File

@@ -6,6 +6,7 @@
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: 644
- makedirs: true
verify_vhost_includes: verify_vhost_includes:
cmd.wait: cmd.wait:
@@ -25,7 +26,7 @@ queue_httpd_graceful:
- watch: - watch:
- cmd: rebuildhttpdconf - cmd: rebuildhttpdconf
/home/{{ salt.pillar.get('gitea:user') }}/public_html/.htaccess: {{ salt.pillar.get('gitea:docroot') }}/.htaccess:
file.managed: file.managed:
- source: 'salt://gitea/files/htaccess.jinja' - source: 'salt://gitea/files/htaccess.jinja'
- template: jinja - template: jinja

23
salt/deb_install/init.sls
View File

@@ -1,23 +1,36 @@
{% from "salt/map.jinja" import salt_daemons with context %} {% from "salt/map.jinja" import salt_daemons with context %}
{% from "salt/deb_install/map.jinja" import osrelease, oscodename with context %} {% from "salt/deb_install/map.jinja" import osrelease, oscodename with context %}
/etc/apt/keyrings/salt-archive-keyring-2023.gpg: /etc/apt/keyrings/salt-archive-keyring-2023.pgp:
file.managed: file.managed:
- source: https://repo.saltproject.io/salt/py3/{{ grains['os'].lower() }}/{{ osrelease }}/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg - source: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
- source_hash: c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 - source_hash: 36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34
/etc/apt/sources.list.d/salt.list: /etc/apt/sources.list.d/salt.list:
file.managed: file.managed:
- contents: "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/{{ grains['os'].lower() }}/{{ osrelease }}/amd64/minor/{{ salt.pillar.get("salt:version") }} {{ oscodename }} main" - contents: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
salt-common: salt-common:
pkg.installed: pkg.installed:
- version: '{{ salt.pillar.get("salt:version") }}' - version: '{{ salt.pillar.get("salt:version") }}'
- refresh: true - refresh: true
- require: - require:
- file: /etc/apt/keyrings/salt-archive-keyring-2023.gpg - file: /etc/apt/keyrings/salt-archive-keyring-2023.pgp
- file: /etc/apt/sources.list.d/salt.list - file: /etc/apt/sources.list.d/salt.list
salt {{ salt.pillar.get("salt:version") }}:
pkg.held:
- pkgs:
- salt-common
{% for daemon in salt_daemons %}
- salt-{{ daemon }}
{% endfor %}
- require:
- pkg: salt-common
{% for daemon in salt_daemons %}
- pkg: salt-{{ daemon }}
{% endfor %}
{% for daemon in salt_daemons %} {% for daemon in salt_daemons %}
salt-{{ daemon }}: salt-{{ daemon }}:
pkg.installed: pkg.installed:

2
salt/files/minion.jinja
View File

@@ -12,4 +12,4 @@ mysql.default_file: '/root/.my.cnf'
mine_functions: mine_functions:
root_id_rsa_pub: root_id_rsa_pub:
- mine_function: file.read - mine_function: file.read
- /root/.ssh/id_rsa.pub - /root/.ssh/id_ed25519.pub