majic-ansible-roles Changeset

Changeset - d5252677bcb0

Parent rev.

Child rev.

[Not reviewed]

8 10 0

Branko Majic (branko) - 8 years ago 2016-01-18 23:20:05
branko@majic.rs

MAR-44: Updated roles depending on backup_client role to use the new design (where only backup patterns are provided to the dependant backup_client role).

18 files changed with 22 insertions and 57 deletions:

roles/common/files/backup_patterns

roles/common/meta/main.yml

roles/common/tasks/backup.yml

roles/common/tasks/main.yml

roles/database/meta/main.yml

roles/database/tasks/backup.yml

roles/database/templates/backup_patterns.j2

roles/ldap_server/files/backup_patterns

roles/ldap_server/meta/main.yml

roles/ldap_server/tasks/backup.yml

roles/mail_server/meta/main.yml

roles/mail_server/tasks/backup.yml

roles/mail_server/tasks/main.yml

roles/mail_server/templates/backup_patterns.j2

roles/xmpp_server/files/backup_patterns

roles/xmpp_server/meta/main.yml

roles/xmpp_server/tasks/backup.yml

roles/xmpp_server/tasks/main.yml

0 comments (0 inline, 0 general)

roles/common/files/backup_patterns

➞

Show inline comments

deleted file

roles/common/meta/main.yml

➞

Show inline comments

@@ @@ -2,4 +2,9 @@ @@
 dependencies:
   - role: backup_client
     when: enable_backup
@@ \ No newline at end of file @@
     when: enable_backup
     backup_patterns_name: common
     backup_patterns:
       - "/root"
       - "/home"
       - "/var/log"
@@ \ No newline at end of file @@

roles/common/tasks/backup.yml

➞

Show inline comments

deleted file

roles/common/tasks/main.yml

➞

Show inline comments

@@ @@ -89,7 +89,3 @@ @@
 - name: Enable ferm service
   service: name=ferm enabled=yes state=started
 - name: Enable backup
   include: backup.yml
   when: enable_backup
@@ \ No newline at end of file @@

roles/database/meta/main.yml

➞

Show inline comments

@@ @@ -4,4 +4,7 @@ allow_duplicates: yes @@
 dependencies:
   - role: backup_client
     when: enable_backup
@@ \ No newline at end of file @@
     when: enable_backup
     backup_patterns_name: "database_{{ db_name }}"
     backup_patterns:
       - "/srv/backup/mariadb/{{ db_name }}.sql"

roles/database/tasks/backup.yml

➞

Show inline comments

@@ @@ -8,12 +8,6 @@ @@
     - "/srv/backup"
     - "/srv/backup/mariadb"
 - name: Deploy include patterns to backup
   template: src="backup_patterns.j2" dest="/etc/duply/main/patterns/database_{{ db_name }}"
             owner="root" group="root" mode="700"
   notify:
     - Assemble Duply include patterns
 - name: Deploy script for creating database backup dumps
   template: src="dump_db.sh.j2" dest="/etc/duply/main/pre.d/dump_{{ db_name }}.sh"
             owner=root group=root mode=700

roles/database/templates/backup_patterns.j2

➞

Show inline comments

deleted file

roles/ldap_server/files/backup_patterns

➞

Show inline comments

deleted file

roles/ldap_server/meta/main.yml

➞

Show inline comments

@@ @@ -3,4 +3,7 @@ @@
 dependencies:
   - ldap_client
   - role: backup_client
     when: enable_backup
@@ \ No newline at end of file @@
     when: enable_backup
     backup_patterns_name: "ldap_server"
     backup_patterns:
       - "/srv/backup/slapd.bak"

roles/ldap_server/tasks/backup.yml

➞

Show inline comments

@@ @@ -7,12 +7,6 @@ @@
     - "/srv"
     - "/srv/backup"
 - name: Deploy include patterns to backup
   copy: src="backup_patterns" dest="/etc/duply/main/patterns/ldap_server"
         owner="root" group="root" mode="700"
   notify:
     - Assemble Duply include patterns
 - name: Deploy script for creating LDAP database backup dumps
   copy: src="ldapdump.sh" dest="/etc/duply/main/pre.d/ldapdump.sh"
         owner=root group=root mode=700

roles/mail_server/meta/main.yml

➞

Show inline comments

@@ @@ -2,4 +2,7 @@ @@
 dependencies:
   - role: backup_client
     when: enable_backup
@@ \ No newline at end of file @@
     when: enable_backup
     backup_patterns_name: "mail_server"
     backup_patterns:
       - "/var/{{ mail_user }}"

roles/mail_server/tasks/backup.yml

➞

Show inline comments

deleted file

roles/mail_server/tasks/main.yml

➞

Show inline comments

@@ @@ -139,7 +139,3 @@ @@
   copy: src="ferm_mail.conf" dest="/etc/ferm/conf.d/20-mail.conf" owner=root group=root mode=640
   notify:
     - Restart ferm
 - name: Enable backup
   include: backup.yml
   when: enable_backup
@@ \ No newline at end of file @@

roles/mail_server/templates/backup_patterns.j2

➞

Show inline comments

deleted file

roles/xmpp_server/files/backup_patterns

➞

Show inline comments

deleted file

roles/xmpp_server/meta/main.yml

➞

Show inline comments

@@ @@ -2,4 +2,7 @@ @@
 dependencies:
   - role: backup_client
     when: enable_backup
@@ \ No newline at end of file @@
     when: enable_backup
     backup_patterns_name: "xmpp_server"
     backup_patterns:
       - "/var/lib/prosody"

roles/xmpp_server/tasks/backup.yml

➞

Show inline comments

deleted file

roles/xmpp_server/tasks/main.yml

➞

Show inline comments

@@ @@ -57,7 +57,3 @@ @@
   copy: src="ferm_xmpp.conf" dest="/etc/ferm/conf.d/30-xmpp.conf" owner=root group=root mode=640
   notify:
     - Restart ferm
 - name: Enable backup
   include: backup.yml
   when: enable_backup
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)