diff --git a/docs/roles/_init.md b/docs/roles/_init.md index f31e8064..8d4fa92e 100644 --- a/docs/roles/_init.md +++ b/docs/roles/_init.md @@ -1,5 +1,5 @@ # Init -Mandatory role that must run before any other `ce-edploy` roles when executing a playbook. +Mandatory role that must run before any other `ce-deploy` roles when executing a playbook. These variables **must** be set in a common variables file if you do not wish to use defaults. diff --git a/roles/database_backup/database_backup-mysql/defaults/main.yml b/roles/database_backup/database_backup-mysql/defaults/main.yml index e7351d89..1401d1ca 100644 --- a/roles/database_backup/database_backup-mysql/defaults/main.yml +++ b/roles/database_backup/database_backup-mysql/defaults/main.yml @@ -5,6 +5,8 @@ mysql_backup: mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here # Location on deploy server where the generated MySQL password will be stashed - should be temporary storage mysql_password_path: "/tmp/.ce-deploy/{{ project_name }}_{{ build_type }}_{{ build_number }}" + # Uncomment to login with MySQL socket instead of TCP/IP (e.g. for MariaDB after secure set-up) + #mysql_unix_socket: /run/mysqld/mysqld.sock # Number of dumps/db to keep. Note this is independant from the build codebases. keep: 10 # This can be one of the following: diff --git a/roles/database_backup/database_backup-mysql/tasks/cleanup-rolling.yml b/roles/database_backup/database_backup-mysql/tasks/cleanup-rolling.yml index 374e65ca..a94ccc2a 100644 --- a/roles/database_backup/database_backup-mysql/tasks/cleanup-rolling.yml +++ b/roles/database_backup/database_backup-mysql/tasks/cleanup-rolling.yml @@ -6,5 +6,6 @@ login_host: "{{ _mysql_host }}" login_user: "{{ _mysql_user }}" login_password: "{{ _mysql_password }}" + login_unix_socket: "{{ mysql_backup.mysql_unix_socket | default(omit) }}" with_sequence: start={{ [previous_build_number | int - cleanup_history_depth, 0] | max }} end={{ [previous_build_number | int - mysql_backup.keep, 0] | max }} run_once: true diff --git a/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml b/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml index 49bda27e..28422dd5 100644 --- a/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml +++ b/roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml @@ -20,6 +20,7 @@ login_host: "{{ _mysql_host }}" login_user: "{{ _mysql_user }}" login_password: "{{ _mysql_password }}" + login_unix_socket: "{{ mysql_backup.mysql_unix_socket | default(omit) }}" when: previous_build_number == 0 or _build_db_status.rc == 1 run_once: true diff --git a/roles/database_backup/database_backup-mysql/tasks/deploy-none.yml b/roles/database_backup/database_backup-mysql/tasks/deploy-none.yml index 4c4b1624..2a8ef973 100644 --- a/roles/database_backup/database_backup-mysql/tasks/deploy-none.yml +++ b/roles/database_backup/database_backup-mysql/tasks/deploy-none.yml @@ -20,5 +20,6 @@ login_host: "{{ _mysql_host }}" login_user: "{{ _mysql_user }}" login_password: "{{ _mysql_password }}" + login_unix_socket: "{{ mysql_backup.mysql_unix_socket | default(omit) }}" when: previous_build_number == 0 or _build_db_status.rc == 1 run_once: true diff --git a/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml b/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml index 30fbaa62..458e0978 100644 --- a/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml +++ b/roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml @@ -19,6 +19,7 @@ state: present config_file: "{{ database.credentials_file }}" config_overrides_defaults: true + login_unix_socket: "{{ mysql_backup.mysql_unix_socket | default(omit) }}" run_once: true - name: Check if the previous database exists.