From 00c619b151a6e7ad40c0b836419c3fccedf75063 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 1 Apr 2021 10:30:05 +0200 Subject: [PATCH] copr-fe: allow easy PostgreSQL connection to copr-fe user --- inventory/group_vars/copr_front_aws | 2 ++ inventory/group_vars/copr_front_dev_aws | 2 ++ roles/copr/frontend-cloud/tasks/main.yml | 7 +++++ .../copr/frontend-cloud/tasks/psql_setup.yml | 28 +++++++++++++++++++ 4 files changed, 39 insertions(+) diff --git a/inventory/group_vars/copr_front_aws b/inventory/group_vars/copr_front_aws index 89a587e1ea..54f7f0ed78 100644 --- a/inventory/group_vars/copr_front_aws +++ b/inventory/group_vars/copr_front_aws @@ -28,3 +28,5 @@ copr_pagure_events: org.fedoraproject.prod.pagure: "https://src.fedoraproject.org/" copr_messaging_queue: "a9b74258-21c6-4e79-ba65-9e858dc84a2b" + +copr_fe_homedir: /usr/share/copr/coprs_frontend diff --git a/inventory/group_vars/copr_front_dev_aws b/inventory/group_vars/copr_front_dev_aws index 01bafa3da4..1546f47216 100644 --- a/inventory/group_vars/copr_front_dev_aws +++ b/inventory/group_vars/copr_front_dev_aws @@ -32,3 +32,5 @@ copr_pagure_events: io.pagure.stg.pagure: "https://stg.pagure.io" copr_messaging_queue: "c8e11df7-e863-4ca4-99b9-d37c6663c7f7" + +copr_fe_homedir: /usr/share/copr/coprs_frontend diff --git a/roles/copr/frontend-cloud/tasks/main.yml b/roles/copr/frontend-cloud/tasks/main.yml index 10d7d958a1..dc3df0cfdd 100644 --- a/roles/copr/frontend-cloud/tasks/main.yml +++ b/roles/copr/frontend-cloud/tasks/main.yml @@ -157,3 +157,10 @@ when: - ansible_facts.packages['copr-frontend'][0].version is version('1.156', '>=') - not services_disabled|bool + +- name: install bashrc file to ease some admin tasks + copy: + content: | + export PGUSER=copr-fe + export PGDATABASE=coprdb + dest: "{{ copr_fe_homedir }}/.bashrc" diff --git a/roles/copr/frontend-cloud/tasks/psql_setup.yml b/roles/copr/frontend-cloud/tasks/psql_setup.yml index 9568a1b95e..a310fc5e0e 100644 --- a/roles/copr/frontend-cloud/tasks/psql_setup.yml +++ b/roles/copr/frontend-cloud/tasks/psql_setup.yml @@ -108,3 +108,31 @@ notify: restart postgresql tags: - config + +- name: install psqlrc file + copy: + content: | + \pset linestyle unicode + \pset border 2 + + -- Switch pagers with :x and :xx commands + \set x '\\setenv PAGER less' + \set xx '\\setenv PAGER \'pspg -bX --no-mouse\'' + :xx + dest: "{{ copr_fe_homedir }}/.psqlrc" + owner: copr-fe + group: copr-fe + mode: 0600 + +- name: install pgpass file + copy: + content: | + localhost:*:coprdb:copr-fe:{{ copr_database_password }} + dest: "{{ copr_fe_homedir }}/.pgpass" + owner: copr-fe + group: copr-fe + mode: 0400 + +- name: install pghistory file + file: path="{{ copr_fe_homedir }}/.psql_history" state=file + owner=copr-fe group=ćopr-fe mode=0600