diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b1a884 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.vscode/ +tasks/test.json diff --git a/README.md b/README.md index 7a34a70..680bbd9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Role Variables - container_storage_dir_base_backup: '/srv' - mariadb_container_max_connections: '512' - mariadb_container_exposed_port: '3306' -- DOCKER_NETWORK_NAME (can be defined in sleif.docker) +- docker_network_name (can be defined in sleif.docker) Dependencies ------------ @@ -28,7 +28,7 @@ Example Playbook - hosts: "server" user: root vars: - DOCKER_NETWORK_NAME: 'custom_docker_network' + docker_network_name: 'custom_docker_network' roles: - { role: sleif.mariadb_docker, tags: "mariadb_docker" } diff --git a/defaults/main.yml b/defaults/main.yml index a23f1e2..45bbe23 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,4 +12,4 @@ MYSQL_USER: "mysql_db_user" MYSQL_PASSWORD: "mysql_db_user_password" MYSQL_DATABASE: "mariadb_custom_database" -DOCKER_NETWORK_NAME: "custom-bridge" +docker_network_name: "custom-bridge" diff --git a/tasks/main.yml b/tasks/main.yml index df1bfec..03df6c3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -20,6 +20,14 @@ # from INFORMATION_SCHEMA.TABLES where CREATE_OPTIONS LIKE "row_format=compressed" AND ENGINE="InnoDB"' > /tmp/m2 # cat /tmp/m2 | mysql -u root -p +# https://github.com/nextcloud/server/issues/25436 +# Check… +# mariadb --batch --skip-column-names -e 'SELECT CONCAT("ALTER TABLE ",TABLE_SCHEMA,".",TABLE_NAME," ROW_FORMAT=DYNAMIC;") from +# INFORMATION_SCHEMA.TABLES where TABLE_NAME like "oc\_%" AND ENGINE = "InnoDB" AND ROW_FORMAT != "Dynamic";' +# …and actually change: +# mariadb --batch --skip-column-names -e 'SELECT CONCAT("ALTER TABLE ",TABLE_SCHEMA,".",TABLE_NAME," ROW_FORMAT=DYNAMIC;") from +# INFORMATION_SCHEMA.TABLES where TABLE_NAME like "oc\_%" AND ENGINE = "InnoDB" AND ROW_FORMAT != "Dynamic";' | mariadb + - name: Start MariaDB container for {{ MYSQL_DATABASE }} community.general.docker_container: name: "{{ MYSQL_CONTAINER_NAME }}" @@ -28,7 +36,7 @@ restart_policy: always recreate: true networks: - - name: "{{ DOCKER_NETWORK_NAME }}" + - name: "{{ docker_network_name }}" aliases: # - mariadb-container - "{{ MYSQL_CONTAINER_NAME }}"