From 983435138d95ac3500257a73c0f7b5340bc61e0e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 Oct 2014 17:35:52 +0000 Subject: [PATCH] Name copr-fe by its name, not ip. Add database backup dir, script and cron. --- ...84.144 => copr-fe.cloud.fedoraproject.org} | 4 ++++ inventory/inventory | 4 ++-- .../hosts/copr-fe.cloud.fedoraproject.org.yml | 4 ++-- roles/copr/frontend/tasks/psql_setup.yml | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) rename inventory/host_vars/{209.132.184.144 => copr-fe.cloud.fedoraproject.org} (86%) diff --git a/inventory/host_vars/209.132.184.144 b/inventory/host_vars/copr-fe.cloud.fedoraproject.org similarity index 86% rename from inventory/host_vars/209.132.184.144 rename to inventory/host_vars/copr-fe.cloud.fedoraproject.org index a8b3508846..83f62c229f 100644 --- a/inventory/host_vars/209.132.184.144 +++ b/inventory/host_vars/copr-fe.cloud.fedoraproject.org @@ -14,3 +14,7 @@ tcp_ports: [22, 80, 443] # Copr vars copr_hostbase: copr-fe + +# dbs to be backed up on this host +dbs_to_backup: +- coprdb diff --git a/inventory/inventory b/inventory/inventory index 254bbf9e97..f7a14f1a86 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -595,7 +595,7 @@ cloud-noc01.cloud.fedoraproject.org #fedocal.dev.fedoraproject.org 209.132.184.147 #copr-fe.cloud.fedoraproject.org -209.132.184.144 +copr-fe.cloud.fedoraproject.org 209.132.184.150 #artboard.cloud.fedoraproject.org 209.132.184.143 @@ -698,7 +698,7 @@ copr-fe-dev.cloud.fedoraproject.org copr-be-dev.cloud.fedoraproject.org [copr-front] -209.132.184.144 +copr-fe.cloud.fedoraproject.org [copr-back] copr-be.cloud.fedoraproject.org diff --git a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml index 69b4f09465..021c99b213 100644 --- a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: 209.132.184.144 + hosts: copr-fe.cloud.fedoraproject.org user: root gather_facts: False @@ -12,7 +12,7 @@ - include: "{{ tasks }}/growroot_cloud.yml" - name: provision instance - hosts: 209.132.184.144 + hosts: copr-fe.cloud.fedoraproject.org user: root gather_facts: True diff --git a/roles/copr/frontend/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml index a3f942a3b9..089c7a8ad6 100644 --- a/roles/copr/frontend/tasks/psql_setup.yml +++ b/roles/copr/frontend/tasks/psql_setup.yml @@ -18,3 +18,22 @@ tags: - config +- name: Ensure postgres has a place to backup to + file: dest=/backups state=directory owner=postgres + tags: + - config + +- name: Copy over backup scriplet + copy: src="{{ files }}/../roles/postgresql_server/files/backup-database" dest=/usr/local/bin/backup-database mode=0755 + tags: + - config + +- name: Set up some cronjobs to backup databases as configured + template: > + src="{{ files }}/../roles/postgresql_server/files/cron-backup-database + dest=/etc/cron.d/cron-backup-database-{{ item }} + with_items: + - "{{ dbs_to_backup }}" + when: dbs_to_backup != [] + tags: + - config