From bb3381a6e146ff68f70960709302205714115dda Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 4 Aug 2019 18:35:09 +0200 Subject: [PATCH] copr: frontend: dump dir is writeable by copr-fe --- .../files/cron.daily/copr-frontend-optional | 2 +- roles/copr/frontend-cloud/tasks/main.yml | 8 ++++++++ roles/copr/frontend-cloud/tasks/psql_setup.yml | 9 --------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional b/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional index dbcd79595c..f1cae910fe 100755 --- a/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional +++ b/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional @@ -7,4 +7,4 @@ runuser -c 'copr-frontend notify_outdated_chroots' - copr-fe runuser -c 'copr-frontend delete_outdated_chroots' - copr-fe -/usr/bin/bash /usr/libexec/copr_dump_db.sh +/usr/bin/bash /usr/libexec/copr_dump_db.sh /var/www/html/db_dumps/ diff --git a/roles/copr/frontend-cloud/tasks/main.yml b/roles/copr/frontend-cloud/tasks/main.yml index 71a6b13f77..bc2c3e7018 100644 --- a/roles/copr/frontend-cloud/tasks/main.yml +++ b/roles/copr/frontend-cloud/tasks/main.yml @@ -38,6 +38,14 @@ tags: - packages +- name: directory for postgresql dumps + file: state=directory path=/var/www/html/db_dumps/ + owner=root mode=755 + +- name: allow postgres writing to db_dumps dir + acl: path=/var/www/html/db_dumps/ + entity=copr-fe permissions=rwx etype=user state=present + - name: install copr configs template: src="copr.conf" dest=/etc/copr/copr.conf mode=600 notify: diff --git a/roles/copr/frontend-cloud/tasks/psql_setup.yml b/roles/copr/frontend-cloud/tasks/psql_setup.yml index 6bbc8d898c..56b8e9d1b8 100644 --- a/roles/copr/frontend-cloud/tasks/psql_setup.yml +++ b/roles/copr/frontend-cloud/tasks/psql_setup.yml @@ -3,15 +3,6 @@ with_items: - "postgresql-server" - "postgresql-contrib" - - "httpd-filesystem" - -- name: directory for postgresql dumps - file: state=directory path=/var/www/html/db_dumps/ - owner=root mode=755 - -- name: allow postgres writing to db_dumps dir - acl: path=/var/www/html/db_dumps/ - entity=postgres permissions=rwx etype=user state=present - name: See if PostgreSQL is initialized stat: path=/var/lib/pgsql/data/PG_VERSION