playbooks/game.yml

@@ -5,6 +5,7 @@
 - hosts: game1.thefuck.how
   vars_files:
     - vars/factorio-main.yml
+    - vars/minecraft-valhelsia.yml
   roles:
     - role: backup
       vars:
@@ -25,6 +26,8 @@
           - minecraft@valhelsia
           - minecraft@vanilla
       tags: [ motd ]
+    - role: minecraft
+      tags: [ game, minecraft, forge, valhelsia ]
     - role: factorio
       vars:
         server_version: 1.0.0
@@ -40,31 +43,13 @@
             lan: false
           admins: [ "rehashed_salt" ]
       tags: [ game, factorio ]
-  # Vanilla Ice
-  # Note that this one doesn't get a nightly restart job because Paper is awesome
 - hosts: game1.thefuck.how
   vars_files:
     - vars/minecraft-vanilla.yml
   roles:
     - role: minecraft
       tags: [ game, minecraft, paper, vanilla ]
-  # Valhelsia
 - hosts: game1.thefuck.how
-  tasks:
-    - name: restart minecraft@valhelsia nightly
-      cron: name=restart-valhelsia hour=5 minute=0 job="systemctl restart minecraft@valhelsia" disabled={{ not minecraft_enabled }}
-      tags: [ game, minecraft, forge, valhelsia, cron ]
-  vars_files:
-    - vars/minecraft-valhelsia.yml
-  roles:
-    - role: minecraft
-      tags: [ game, minecraft, forge, valhelsia ]
-  # The Magic Pack
-- hosts: game1.thefuck.how
-  tasks:
-    - name: restart minecraft@dammit nightly
-      cron: name=restart-dammit hour=5 minute=0 job="systemctl restart minecraft@dammit" disabled={{ not minecraft_enabled }}
-      tags: [ game, minecraft, forge, dammit, cron ]
   vars_files:
     - vars/minecraft-dammit.yml
   roles:

roles/pulseaudio/templates/pulseaudio.service

@@ -18,7 +18,6 @@ User=pulseaudio
 Group=pulseaudio
 ExecStart=/usr/bin/pulseaudio --disallow-exit
 ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
 
 [Install]
 WantedBy=multi-user.target