Kaynağa Gözat

[postgres] Upgrade to 14 and bump pgadmin4

Colin Powell 1 yıl önce
ebeveyn
işleme
94f6f32497

+ 2 - 2
lab/ansible/roles/pgadmin4/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 - name: Dependencies installed
   pkgng:
-    name: py38-pip,py38-sqlite3,postgresql13-client,rust
+    name: py39-pip,py39-sqlite3,postgresql14-client,rust,jpeg-turbo,tiff,webp,freetype2
     state: latest
 
 - name: Pgadmin package installed
-  shell: "pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v6.1/pip/pgadmin4-6.1-py3-none-any.whl"
+  shell: "pip install pgadmin4"
 
 - name: Pgadmin rc file installed
   ansible.builtin.copy:

+ 18 - 139
lab/ansible/roles/postgres/tasks/main.yml

@@ -4,7 +4,7 @@
 
 - name: PostgreSQL packages installed
   community.general.pkgng:
-    name: postgresql13-server,postgresql13-client,postgresql13-contrib,py38-pip,rsync
+    name: postgresql14-server,postgresql14-client,postgresql14-contrib,py39-pip,rsync
     state: latest
 
 - name: Psycopg2 installed
@@ -14,7 +14,7 @@
   shell: sysrc postgresql_enable="YES"
 
 - name: Postgres initialized
-  shell: initdb --pgdata=/var/db/postgres/data13
+  shell: initdb --pgdata=/var/db/postgres/data14
   become: yes
   become_method: su
   become_user: postgres
@@ -23,7 +23,7 @@
 - name: Postgres access file patched
   patch:
     src: pg_hba.conf.patch
-    dest: /var/db/postgres/data13/pg_hba.conf
+    dest: /var/db/postgres/data14/pg_hba.conf
   become: yes
   become_method: su
   become_user: postgres
@@ -32,7 +32,7 @@
 - name: Postgres config file patched
   patch:
     src: postgresql.conf.patch
-    dest: /var/db/postgres/data13/postgresql.conf
+    dest: /var/db/postgres/data14/postgresql.conf
   become: yes
   become_method: su
   become_user: postgres
@@ -40,13 +40,13 @@
 
 - name: Postgres config file permissions fixed
   file:
-    path: /var/db/postgres/data13/postgresql.conf
+    path: /var/db/postgres/data14/postgresql.conf
     owner: postgres
     group: postgres
 
 - name: Pg_hba config file permissions fixed
   file:
-    path: /var/db/postgres/data13/pg_hba.conf
+    path: /var/db/postgres/data14/pg_hba.conf
     owner: postgres
     group: postgres
 
@@ -75,68 +75,6 @@
   become_method: su
   become_user: postgres
 
-- name: 15Five user exists
-  community.postgresql.postgresql_user:
-    name: fifteenfive
-    password: "{{ fifteenfive_db_pass }}"
-    role_attr_flags: CREATEDB,NOSUPERUSER,LOGIN
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: 15Five database exists
-  community.postgresql.postgresql_db:
-    name: "fifteenfive"
-    state: present
-    owner: fifteenfive
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: 15Five database has btree_gist extension
-  community.postgresql.postgresql_ext:
-    name: btree_gist
-    db: fifteenfive
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: 15Five database has btree_gin extension
-  community.postgresql.postgresql_ext:
-    name: btree_gin
-    db: fifteenfive
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: 15Five database has ltree extension
-  community.postgresql.postgresql_ext:
-    name: ltree
-    db: fifteenfive
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: 15Five database has hstore extension
-  community.postgresql.postgresql_ext:
-    name: hstore
-    db: fifteenfive
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
 - name: gogs user exists
   community.postgresql.postgresql_user:
     name: gogs
@@ -198,10 +136,10 @@
   tags:
     - create_dbs
 
-- name: synapse user exists
+- name: vrobbler user exists
   community.postgresql.postgresql_user:
-    name: synapse
-    password: "{{ synapse_db_pass }}"
+    name: vrobbler
+    password: "{{ vrobbler_db_pass }}"
     role_attr_flags: NOSUPERUSER,LOGIN
   become: yes
   become_method: su
@@ -209,70 +147,21 @@
   tags:
     - create_dbs
 
-- name: synapse database exists
+- name: vrobbler database exists
   community.postgresql.postgresql_db:
-    name: "synapse"
+    name: "vrobbler"
     state: present
-    owner: synapse
+    owner: vrobbler
   become: yes
   become_method: su
   become_user: postgres
   tags:
     - create_dbs
 
-- name: grafana user exists
+- name: emus user exists
   community.postgresql.postgresql_user:
-    name: grafana
-    password: "{{ grafana_db_pass }}"
-    role_attr_flags: NOSUPERUSER,LOGIN
-  tags:
-    - create_dbs
-
-- name: grafana_read_only user exists
-  community.postgresql.postgresql_user:
-    name: grafana_read_only
-    password: "{{ grafana_read_only_pass }}"
-    role_attr_flags: NOSUPERUSER,LOGIN
-  tags:
-    - create_dbs
-
-- name: grafana database exists
-  community.postgresql.postgresql_db:
-    name: "grafana"
-    state: present
-    owner: grafana
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: sentry user exists
-  community.postgresql.postgresql_user:
-    name: sentry
-    password: "{{ sentry_db_pass }}"
-    role_attr_flags: NOSUPERUSER,LOGIN
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: sentry database exists
-  community.postgresql.postgresql_db:
-    name: "sentry"
-    state: present
-    owner: sentry
-  become: yes
-  become_method: su
-  become_user: postgres
-  tags:
-    - create_dbs
-
-- name: engagement user exists
-  community.postgresql.postgresql_user:
-    name: engagement
-    password: "{{ engagement_db_pass }}"
+    name: emus
+    password: "{{ emus_db_pass }}"
     role_attr_flags: NOSUPERUSER,LOGIN
   become: yes
   become_method: su
@@ -280,23 +169,13 @@
   tags:
     - create_dbs
 
-- name: engagement database exists
+- name: emus database exists
   community.postgresql.postgresql_db:
-    name: "engagement"
+    name: "emus"
     state: present
-    owner: engagement
+    owner: emus
   become: yes
   become_method: su
   become_user: postgres
   tags:
     - create_dbs
-
-- name: sentry database has citext extension
-  community.postgresql.postgresql_ext:
-    name: citext
-    db: sentry
-  become_user: postgres
-  become_method: su
-  become: yes
-  tags:
-    - create_dbs