Merge branch 'master' of git.9iron.club:salt/ansible

reboot.yml

@@ -1,7 +1,7 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
 ---
-- hosts: all
+- hosts: dbservers,webservers,gameservers
   serial: 1
   tasks:
     - name: Check for reboot-required

roles/ansible-pull/templates/ansible-pull.service

@@ -9,7 +9,7 @@ User=ansible
 Group=ansible
 Environment=ANSIBLE_CONFIG=~/ansible-pull-repo/ansible-pull.cfg
 ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "{{ ansible_pull_repo }}" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" "{{ ansible_pull_playbook }}"
-Restart=always
+Restart=on-failure
 RestartSec=90
 
 [Install]

roles/desktop-common/tasks/main.yml

@@ -17,8 +17,6 @@
       loop:
         # Works around a bug where this causes failed logins
         - "/etc/X11/Xsession.d/70im-config_launch"
-        # Works around SDDM never actually sourcing a user's xsessionrc
-        - "/etc/X11/Xsession.d/99x11-common_start"
     - name: Copy system configs
       template:
         src: "{{ item.src }}"

roles/nextcloud/templates/backup.sh

@@ -23,8 +23,8 @@ if ! [ -d "$OUTDIR" ]; then
 		return 2
 	fi
 fi
-# Enforce permissions on our output directory since the git user will need them
+# Enforce permissions on our output directory
-chown root.git "$OUTDIR"
+chown root. "$OUTDIR"
 chmod 770 "$OUTDIR"
 
 # Purge oldest backup if we need to

roles/pleroma/templates/config.exs

@@ -24,6 +24,9 @@ config :pleroma, :media_proxy,
 	enabled: false,
 	redirect_on_failure: true
 
+# Use in-db configs
+config :pleroma, configurable_from_database: true
+
 # DB configuration
 config :pleroma, Pleroma.Repo,
 	adapter: Ecto.Adapters.Postgres,