Skip to content

Commit 6cf279b

Browse files
author
Jonathan Lozada D
authored
Merge branch 'master' into jlozadad_fix_dependencies
2 parents ebe3b40 + 2ca71e4 commit 6cf279b

File tree

4 files changed

+41
-15
lines changed

4 files changed

+41
-15
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Icon
77
.Trashes
88
.vagrant
99
test
10+
*.retry

README.md

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,37 @@ To install:
1818
ansible-galaxy install ANXS.postgresql
1919
```
2020

21+
2122
#### Dependencies
2223

2324
- ANXS.monit ([Galaxy](https://galaxy.ansible.com/list#/roles/502)/[GH](https://github.com/ANXS/monit)) if you want monit protection (in that case, you should set `monit_protection: true`)
2425

2526

2627
#### Compatibility matrix
28+
2729
| Distribution / PostgreSQL | <= 9.2 | 9.3 | 9.4 | 9.5 | 9.6 | 10 | 11 |
2830
| ------------------------- |:------:|:---:|:---:|:---:|:---:|:--:|:--:|
29-
| Ubuntu 14.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:| :grey_question:|
30-
| Ubuntu 16.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:| :grey_question:|
31-
| Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:| :grey_question:|
32-
| Debian 9.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:| :grey_question:|
33-
| CentOS 6.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:| :grey_question:|
34-
| CentOS 7.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:| :grey_question:|
31+
| Ubuntu 14.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:|
32+
| Ubuntu 16.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:|
33+
| Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:|
34+
| Debian 9.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:|
35+
| CentOS 6.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:|
36+
| CentOS 7.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:| :grey_question:|
3537

3638
- :white_check_mark: - tested, works fine
3739
- :grey_question: - will work in the future (help out if you can)
3840
- :interrobang: - maybe works, not tested
3941
- :no_entry: - PostgreSQL has reached EOL
4042

43+
4144
#### Variables
4245

4346
```yaml
4447
# Basic settings
4548
postgresql_version: 9.6
46-
postgresql_encoding: 'UTF-8'
47-
postgresql_locale: 'en_US.UTF-8'
48-
postgresql_ctype: 'en_US.UTF-8'
49+
postgresql_encoding: "UTF-8"
50+
postgresql_locale: "en_US.UTF-8"
51+
postgresql_ctype: "en_US.UTF-8"
4952

5053
postgresql_admin_user: "postgres"
5154
postgresql_default_auth_method: "trust"
@@ -63,9 +66,9 @@ postgresql_databases:
6366
hstore: yes # flag to install the hstore extension on this database (yes/no)
6467
uuid_ossp: yes # flag to install the uuid-ossp extension on this database (yes/no)
6568
citext: yes # flag to install the citext extension on this database (yes/no)
66-
encoding: 'UTF-8' # override global {{ postgresql_encoding }} variable per database
67-
lc_collate: 'en_GB.UTF-8' # override global {{ postgresql_locale }} variable per database
68-
lc_ctype: 'en_GB.UTF-8' # override global {{ postgresql_ctype }} variable per database
69+
encoding: "UTF-8" # override global {{ postgresql_encoding }} variable per database
70+
lc_collate: "en_GB.UTF-8" # override global {{ postgresql_locale }} variable per database
71+
lc_ctype: "en_GB.UTF-8" # override global {{ postgresql_ctype }} variable per database
6972

7073
# List of database extensions to be created (optional)
7174
postgresql_database_extensions:
@@ -88,10 +91,11 @@ postgresql_user_privileges:
8891
role_attr_flags: "CREATEDB" # role attribute flags
8992
```
9093
91-
There's a lot more knobs and bolts to set, which you can find in the defaults/main.yml
94+
There's a lot more knobs and bolts to set, which you can find in the [defaults/main.yml](./defaults/main.yml)
9295
9396
9497
#### Testing
98+
9599
This project comes with a Vagrantfile, this is a fast and easy way to test changes to the role, fire it up with `vagrant up`
96100

97101
See [vagrant docs](https://docs.vagrantup.com/v2/) for getting setup with vagrant
@@ -102,14 +106,30 @@ If you want to toy with the test play, see [tests/playbook.yml](./tests/playbook
102106

103107
If you are contributing, please first test your changes within the vagrant environment, (using the targeted distribution), and if possible, ensure your change is covered in the tests found in [.travis.yml](./.travis.yml)
104108

109+
105110
#### License
106111

107112
Licensed under the MIT License. See the [LICENSE](./LICENSE) file for details.
108113

109114

110115
#### Thanks
111116

112-
To the contributors:
117+
Creator:
118+
- [Pjan Vandaele](https://github.com/pjan)
119+
120+
Maintainers:
121+
- [Jonathan Lozada D.](https://github.com/jlozadad)
122+
- [Jonathan Freedman](https://github.com/otakup0pe)
123+
- [Sergei Antipov](https://github.com/UnderGreen)
124+
125+
Top Contributors:
126+
- [David Farrington](https://github.com/farridav)
127+
- [Jesse Lang](https://github.com/jesselang)
128+
- [Greg Clough](https://github.com/gclough)
129+
- [Michael Conrad](https://github.com/MichaelConrad)
130+
- [Sébastien Alix](https://github.com/sebalix)
131+
- [Copperfield](https://github.com/Copperfield)
132+
113133
- [Ralph von der Heyden](https://github.com/ralph)
114134

115135

tasks/configure.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,8 @@
154154
mode: u=rwX,g=rwXs,o=rx
155155
notify: restart postgresql with service
156156

157+
- name: PostgreSQL | Reload all conf files
158+
service:
159+
name: "{{ postgresql_service_name }}"
160+
state: reloaded
161+
when: postgresql_configuration_pt1.changed or postgresql_configuration_pt2.changed or postgresql_configuration_pt3.changed or postgresql_systemd_custom_conf.changed

tasks/install_yum.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- block:
77
- name: PostgreSQL | Install all the required dependencies
88
yum:
9-
name: ["ca-certificates","python-psycopg2", "python-pycurl", "glibc-common","epel-release"]
9+
name: ["ca-certificates","python-psycopg2", "python-pycurl", "glibc-common","epel-release","libselinux-python"]
1010
state: present
1111

1212
- name: PostgreSQL | Add PostgreSQL repository

0 commit comments

Comments
 (0)