diff options
| -rw-r--r-- | dan/ele-media.yml | 6 | ||||
| -rw-r--r-- | roles/elevate/media/tasks/nextcloud.yml | 6 | ||||
| -rw-r--r-- | roles/mysql/tasks/main.yml | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/dan/ele-media.yml b/dan/ele-media.yml index 4464a7e4..8ed41b1b 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -9,11 +9,11 @@ - role: core/cpu-microcode - role: core/admin-users - role: dyndns/client - - role: apt-repo/spreadspace +# - role: apt-repo/spreadspace - role: acmetool/base - role: mysql - role: docker/engine - role: nginx/base - role: elevate/media - - role: network/wireguard/base - - role: network/wireguard/gateway +# - role: network/wireguard/base +# - role: network/wireguard/gateway diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml index 92195f4c..ec0c7807 100644 --- a/roles/elevate/media/tasks/nextcloud.yml +++ b/roles/elevate/media/tasks/nextcloud.yml @@ -65,8 +65,7 @@ - name: create nextcloud database mysql_db: - login_user: root - login_unix_socket: /var/run/mysqld/mysqld.sock + check_implicit_admin: yes db: "{{ nextcloud_db.db }}" encoding: utf8mb4 collation: utf8mb4_general_ci @@ -74,8 +73,7 @@ - name: create nextcloud database user mysql_user: - login_user: root - login_unix_socket: /var/run/mysqld/mysqld.sock + check_implicit_admin: yes name: "{{ nextcloud_db.user }}" password: "{{ nextcloud_db.password }}" priv: "{{ nextcloud_db.db }}.*:SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,ALTER,CREATE TEMPORARY TABLES" diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index 34a897ba..d261470a 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -13,15 +13,15 @@ - name: delete anonymous MySQL server user mysql_user: - login_user: root login_unix_socket: /var/run/mysqld/mysqld.sock + check_implicit_admin: yes user: "" state: absent no_log: true - name: remove the MySQL test database mysql_db: - login_user: root login_unix_socket: /var/run/mysqld/mysqld.sock + check_implicit_admin: yes db: test state: absent |