Format Code

services/init.sls

@@ -1,5 +1,5 @@
 include:
-    - .mysql
-    - .podman
-    - .ssh
-    - .salt
+  - .mysql
+  - .podman
+  - .ssh
+  - .salt

services/mysql.sls

@@ -1,19 +1,19 @@
 include:
-    - system.packages
+  - system.packages
 
 system_service_mysql_enable:
-    service.enabled:
-        - name: mariadb
-        - require:
-            - system_packages_install
-    file.directory:
-        - name: /var/lib/mysql
-        - create: False
-        - replace: False
-        - user: mysql
-        - group: mysql
-        - recurse:
-            - user
-            - group
-        - require:
-            - system_packages_install
+  service.enabled:
+    - name: mariadb
+    - require:
+      - system_packages_install
+  file.directory:
+    - name: /var/lib/mysql
+    - create: False
+    - replace: False
+    - user: mysql
+    - group: mysql
+    - recurse:
+      - user
+      - group
+    - require:
+      - system_packages_install

services/podman.sls

@@ -1,8 +1,8 @@
 include:
-    - system.packages
+  - system.packages
 
 system_service_podman_enable:
-    service.enabled:
-        - name: podman
-        - require:
-            - system_packages_install
+  service.enabled:
+    - name: podman
+    - require:
+      - system_packages_install

services/salt.sls

@@ -1,12 +1,12 @@
 include:
-    - system.packages
+  - system.packages
 
 services_salt_file_client_local:
-    file.managed:
-        - name: /etc/salt/minion.d/noveria.conf
-        - source: salt://{{ tpldir }}/files/salt_noveria.conf
-        - user: root
-        - group: root
-        - mode: 640
-        - require:
-            - system_packages_install
+  file.managed:
+    - name: /etc/salt/minion.d/noveria.conf
+    - source: salt://{{ tpldir }}/files/salt_noveria.conf
+    - user: root
+    - group: root
+    - mode: 640
+    - require:
+      - system_packages_install

services/ssh.sls

@@ -2,27 +2,27 @@ include:
     - system.packages
 
 system_ssh_add_keys:
-    file.managed:
-        - name: /root/.ssh/authorized_keys
-        - source: salt://{{ tpldir }}/files/ssh_authorized_keys
-        - makedirs: True
-        - user: root
-        - group: root
-        - require:
-            - system_packages_install
+  file.managed:
+    - name: /root/.ssh/authorized_keys
+    - source: salt://{{ tpldir }}/files/ssh_authorized_keys
+    - makedirs: True
+    - user: root
+    - group: root
+    - require:
+      - system_packages_install
 
 system_ssh_configuration:
-    file.managed:
-        - name: /etc/ssh/sshd_config
-        - source: salt://{{ tpldir }}/files/ssh_sshd_config
+  file.managed:
+    - name: /etc/ssh/sshd_config
+    - source: salt://{{ tpldir }}/files/ssh_sshd_config
 
 system_ssh_enable:
-    service.running:
-        - name: sshd
-        - enable: True
-        - watch:
-            - system_ssh_configuration
-            - system_ssh_add_keys
-        - require:
-            - system_ssh_configuration
-            - system_ssh_add_keys
+  service.running:
+    - name: sshd
+    - enable: True
+    - watch:
+      - system_ssh_configuration
+      - system_ssh_add_keys
+    - require:
+      - system_ssh_configuration
+      - system_ssh_add_keys

system/btrfs.sls

@@ -1,20 +1,20 @@
 system_btrfs_create_podman_data_dir:
-    cmd.run:
-        - creates: /opt/podman
-        - name: btrfs subvolume create /opt/podman
-    file.managed:
-        - name: /opt/podman
-        - create: False
-        - replace: False
-        - user: root
-        - group: root
+  cmd.run:
+    - creates: /opt/podman
+    - name: btrfs subvolume create /opt/podman
+  file.managed:
+    - name: /opt/podman
+    - create: False
+    - replace: False
+    - user: root
+    - group: root
 
 system_btrfs_create_noveria_home:
-    cmd.run:
-        - creates: /home/noveria
-        - name: btrfs subvolume create /home/noveria
+  cmd.run:
+    - creates: /home/noveria
+    - name: btrfs subvolume create /home/noveria
 
 system_btrfs_create_mysql_data_dir:
-    cmd.run:
-        - creates: /var/lib/mysql
-        - name: btrfs subvolume create /var/lib/mysql
+  cmd.run:
+    - creates: /var/lib/mysql
+    - name: btrfs subvolume create /var/lib/mysql

system/firewall.sls

@@ -1,7 +1,7 @@
 system_firewall_pkgs:
   pkg.installed:
     - pkgs:
-        - iptables
+      - iptables
 
 system_firewall_rules:
   file.managed:
@@ -31,7 +31,7 @@ system_firewall_service_reload:
     - enable: true
     - reload: true
     - watch:
-      - file: /etc/iptables/rules-save
+      - system_firewall_rules
     - require:
       - system_firewall_pkgs
       - system_firewall_service_reload

system/init.sls

@@ -1,4 +1,4 @@
 include:
-    - .btrfs
-    - .user
-    - .packages
+  - .btrfs
+  - .user
+  - .packages

system/packages.sls

@@ -1,13 +1,13 @@
 include:
-    - .btrfs
+  - .btrfs
 
 system_packages_install:
-    pkg.installed:
-        - pkgs:
-            - podman
-            - mariadb
-            - openjdk17-jre-headless
-            - jq
-        - require:
-            - system_btrfs_create_podman_data_dir
-            - system_btrfs_create_mysql_data_dir
+  pkg.installed:
+    - pkgs:
+      - podman
+      - mariadb
+      - openjdk17-jre-headless
+      - jq
+    - require:
+      - system_btrfs_create_podman_data_dir
+      - system_btrfs_create_mysql_data_dir

system/user.sls

@@ -2,21 +2,21 @@ include:
     - .btrfs
 
 system_user_create:
-    user.present:
-        - name: noveria
-        - shell: /bin/false
-        - home: /home/noveria
-        - usergroup: True
-        - createhome: False
+  user.present:
+    - name: noveria
+    - shell: /bin/false
+    - home: /home/noveria
+    - usergroup: True
+    - createhome: False
 
 system_user_create_home_noveria:
-    file.directory:
-        - name: /home/noveria
-        - user: noveria
-        - group: noveria
-        - mode: 700
-        - recurse:
-            - user
-            - group
-        - require:
-            - system_btrfs_create_noveria_home
+  file.directory:
+    - name: /home/noveria
+    - user: noveria
+    - group: noveria
+    - mode: 700
+    - recurse:
+      - user
+      - group
+    - require:
+      - system_btrfs_create_noveria_home