From e0011646a0dd044efd1f61128cb3fb7e5fa28190 Mon Sep 17 00:00:00 2001 From: Salt Date: Wed, 19 Aug 2020 04:48:02 -0500 Subject: [PATCH 1/5] Only restart Ansible on failure whups --- roles/ansible-pull/templates/ansible-pull.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ansible-pull/templates/ansible-pull.service b/roles/ansible-pull/templates/ansible-pull.service index 9891dd1..92e9928 100644 --- a/roles/ansible-pull/templates/ansible-pull.service +++ b/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] From a443cbb2976d26cb73dff3402ccaf04fe7819912 Mon Sep 17 00:00:00 2001 From: Salt Date: Sat, 22 Aug 2020 23:44:23 -0500 Subject: [PATCH 2/5] Fix Nextcloud backup script incorrect perms --- roles/nextcloud/templates/backup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nextcloud/templates/backup.sh b/roles/nextcloud/templates/backup.sh index fb5f06b..f20c9b4 100644 --- a/roles/nextcloud/templates/backup.sh +++ b/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 -chown root.git "$OUTDIR" +# Enforce permissions on our output directory +chown root. "$OUTDIR" chmod 770 "$OUTDIR" # Purge oldest backup if we need to From b71dd77a59407d01bc6729509f029d01acc9035e Mon Sep 17 00:00:00 2001 From: Salt Date: Sun, 23 Aug 2020 01:15:18 -0500 Subject: [PATCH 3/5] Reboot machines in a less-destructive order --- reboot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reboot.yml b/reboot.yml index 6af24ad..bd3ec95 100755 --- a/reboot.yml +++ b/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 From 8e2d11adad3a5148e5f094d2ef5392a9034e7d6a Mon Sep 17 00:00:00 2001 From: Salt Date: Sun, 23 Aug 2020 19:28:51 -0500 Subject: [PATCH 4/5] Revert SDDM 99x11-common_start workaround thing --- roles/desktop-common/tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/desktop-common/tasks/main.yml b/roles/desktop-common/tasks/main.yml index 2364d6d..22a087e 100644 --- a/roles/desktop-common/tasks/main.yml +++ b/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 }}" From 079eb24de109ba572e76cfb1235cb1a86fd66d4e Mon Sep 17 00:00:00 2001 From: Salt Date: Sun, 23 Aug 2020 20:25:47 -0500 Subject: [PATCH 5/5] Pleroma: Enable in-db configs --- roles/pleroma/templates/config.exs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/pleroma/templates/config.exs b/roles/pleroma/templates/config.exs index 0dc4d26..388a5c9 100644 --- a/roles/pleroma/templates/config.exs +++ b/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,