From dbc9f7d6aeb847e44524b3a3ffbaf6f36fd0008d Mon Sep 17 00:00:00 2001 From: Salt Date: Mon, 18 Jan 2021 05:08:43 -0600 Subject: [PATCH] Always become --- inventory/hosts.yml | 1 + playbooks/db.yml | 6 ------ playbooks/desktop.yml | 9 --------- playbooks/game.yml | 6 ------ playbooks/web.yml | 13 ------------- site.yml | 2 -- 6 files changed, 1 insertion(+), 36 deletions(-) diff --git a/inventory/hosts.yml b/inventory/hosts.yml index d760820..7b78937 100644 --- a/inventory/hosts.yml +++ b/inventory/hosts.yml @@ -1,6 +1,7 @@ # vim:ft=ansible: all: vars: + ansible_become: yes ansible_user: ansible children: desktop: diff --git a/playbooks/db.yml b/playbooks/db.yml index c61b3a7..32587ea 100755 --- a/playbooks/db.yml +++ b/playbooks/db.yml @@ -7,13 +7,11 @@ - role: backup vars: backup_script: s3pgdump - become: yes tags: [ backup ] - role: motd vars: motd_watch_services_extra: - postgresql - become: yes tags: [ motd ] - role: postgresql vars: @@ -37,20 +35,17 @@ owner: gitea-desultd - name: nextcloud-desultd owner: nextcloud-desultd - become: yes tags: [ db, psql ] - hosts: psql1.9iron.club roles: - role: backup vars: backup_script: s3pgdump - become: yes tags: [ backup ] - role: motd vars: motd_watch_services_extra: - postgresql - become: yes tags: [ motd ] - role: postgresql vars: @@ -86,5 +81,4 @@ lc_collate: C lc_ctype: C owner: matrix - become: yes tags: [ db, psql ] diff --git a/playbooks/desktop.yml b/playbooks/desktop.yml index 84edbd2..20f0c09 100755 --- a/playbooks/desktop.yml +++ b/playbooks/desktop.yml @@ -9,14 +9,12 @@ path: /etc/mono/config insertafter: "" line: '' - become: yes tags: [ desktop, mono ] - name: give python3 cap_sys_ptrace capabilities: path: /usr/bin/python3.8 # Required for Randovania to access Dolphin memory capability: cap_sys_ptrace=eip - become: yes tags: [ desktop, python, cap ] roles: - role: backup @@ -24,27 +22,20 @@ backup_s3backup_tar_args_extra: h backup_s3backup_list_extra: - /home/salt/.backup/ - become: yes tags: [ backup ] - role: motd - become: yes tags: [ motd ] - role: desktop - become: yes tags: [ desktop ] - role: grub - become: yes tags: [ desktop, grub ] - role: udev vars: udev_rules: # Switch RCM stuff - SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0664", GROUP="plugdev" - become: yes tags: [ desktop, udev ] - role: pulseaudio - become: yes tags: [ desktop, pulse, pulseaudio ] - role: zerotier - become: yes tags: [ desktop, zerotier ] diff --git a/playbooks/game.yml b/playbooks/game.yml index 30b5b61..1dd31f2 100755 --- a/playbooks/game.yml +++ b/playbooks/game.yml @@ -15,7 +15,6 @@ - /opt/minecraft/dammit/backups - /opt/minecraft/valhelsia/backups - /opt/minecraft/vanilla/backups - become: yes tags: [ backup ] - role: motd vars: @@ -23,7 +22,6 @@ - minecraft@dammit - minecraft@valhelsia - minecraft@vanilla - become: yes tags: [ motd ] - role: minecraft vars: @@ -49,7 +47,6 @@ - "https://media.forgecdn.net/files/3113/275/industrial-foregoing-1.16.4-3.2.2-daea863.jar" minecraft_forge_mods_remove: - industrial-foregoing-1.16.3-3.1.1-a834e76.jar - become: yes tags: [ game, minecraft, forge, valhelsia ] - role: factorio vars: @@ -65,7 +62,6 @@ public: false lan: false admins: [ "rehashed_salt" ] - become: yes tags: [ game, factorio ] - hosts: game1.thefuck.how roles: @@ -88,7 +84,6 @@ - opt: view-distance value: 12 minecraft_paper_install: yes - become: yes tags: [ game, minecraft, paper, vanilla ] - hosts: game1.thefuck.how roles: @@ -125,5 +120,4 @@ - Stellar+API-0.1.3.8.jar - Stellar+Sky-0.1.5.7.jar - World-Tooltips-1.7.10-1.2.3-79.jar - become: yes tags: [ game, minecraft, forge, dammit ] diff --git a/playbooks/web.yml b/playbooks/web.yml index 803bd64..359fb7e 100755 --- a/playbooks/web.yml +++ b/playbooks/web.yml @@ -6,7 +6,6 @@ tasks: - name: configure nextcloud cronjob cron: user=www-data name=nextcloud minute=*/5 job="php -f /var/www/nc.desu.ltd/cron.php" - become: yes tags: [ nextcloud, cron ] vars_files: - vars/apache.yml @@ -24,10 +23,8 @@ - /srv/desu.ltd backup_s3backup_exclude_list_extra: - /var/lib/gitea/log - become: yes tags: [ backup ] - role: motd - become: yes vars: motd_watch_services_extra: - apache2 @@ -35,13 +32,10 @@ - php7.4-fpm tags: [ motd ] - role: certbot - become: yes tags: [ web, certbot ] - role: php - become: yes tags: [ web, php ] - role: apache - become: yes tags: [ web, apache ] - role: git vars: @@ -52,10 +46,8 @@ dest: /var/www/www.9iron.club - repo: https://git.desu.ltd/salt/gitea-custom dest: /usr/local/bin/custom - become: yes tags: [ web, git ] - role: nextcloud - become: yes tags: [ web, nextcloud ] - role: gitea vars: @@ -77,7 +69,6 @@ gitea_ssh_port: 22 gitea_start_ssh: no gitea_user: git - become: yes tags: [ web, gitea ] - hosts: game1.thefuck.how roles: @@ -92,7 +83,6 @@ - domains: - thefuck.how - game1.thefuck.how - become: yes tags: [ web, certbot ] - role: php vars: @@ -105,7 +95,6 @@ - php-redis - php-bcmath - php-gmp - become: yes tags: [ web, php ] - role: apache vars: @@ -148,12 +137,10 @@ certificate_file: /etc/letsencrypt/live/thefuck.how/fullchain.pem certificate_key_file: /etc/letsencrypt/live/thefuck.how/privkey.pem certificate_chain_file: /etc/letsencrypt/live/thefuck.how/chain.pem - become: yes tags: [ web, apache ] - role: git vars: git_repos: - repo: https://git.desu.ltd/salt/thefuckhow dest: /var/www/thefuck.how - become: yes tags: [ web, git ] diff --git a/site.yml b/site.yml index 60b9dfb..1037f8a 100755 --- a/site.yml +++ b/site.yml @@ -5,10 +5,8 @@ - hosts: all roles: - role: common - become: yes tags: [ common ] - role: ansible-pull - become: yes tags: [ ansible, common ] # Import specific playbooks - import_playbook: playbooks/db.yml