Skip to content

Commit

Permalink
lint changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sleif committed Nov 24, 2023
1 parent 216bda5 commit 2f867c1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.vscode/
tasks/test.json
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------
Expand All @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 9 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -28,7 +36,7 @@
restart_policy: always
recreate: true
networks:
- name: "{{ DOCKER_NETWORK_NAME }}"
- name: "{{ docker_network_name }}"
aliases:
# - mariadb-container
- "{{ MYSQL_CONTAINER_NAME }}"
Expand Down

0 comments on commit 2f867c1

Please sign in to comment.