Skip to content

Commit dfbe3d6

Browse files
author
Greg Clough
committed
Allow repo to be optional, in case of Satellite, Artifactory, etc.
1 parent 68c7d7c commit dfbe3d6

19 files changed

+1620
-172
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: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +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
27-
| Distribution / PostgreSQL | <= 9.2 | 9.3 | 9.4 | 9.5 | 9.6 |
28-
| ------------------------- |:------:|:---:|:---:|:---:|:---:|
29-
| Ubuntu 14.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
30-
| Ubuntu 16.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
31-
| Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
32-
| Debian 9.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
33-
| Centos 6.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
34-
| Centos 7.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
28+
29+
| Distribution / PostgreSQL | <= 9.2 | 9.3 | 9.4 | 9.5 | 9.6 | 10 | 11 |
30+
| ------------------------- |:------:|:---:|:---:|:---:|:---:|:--:|:--:|
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
39+
- :grey_question: - will work in the future (help out if you can)
3740
- :interrobang: - maybe works, not tested
3841
- :no_entry: - PostgreSQL has reached EOL
3942

43+
4044
#### Variables
4145

4246
```yaml
4347
# Basic settings
4448
postgresql_version: 9.6
45-
postgresql_encoding: 'UTF-8'
46-
postgresql_locale: 'en_US.UTF-8'
47-
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"
4852

4953
postgresql_admin_user: "postgres"
5054
postgresql_default_auth_method: "trust"
@@ -62,9 +66,9 @@ postgresql_databases:
6266
hstore: yes # flag to install the hstore extension on this database (yes/no)
6367
uuid_ossp: yes # flag to install the uuid-ossp extension on this database (yes/no)
6468
citext: yes # flag to install the citext extension on this database (yes/no)
65-
encoding: 'UTF-8' # override global {{ postgresql_encoding }} variable per database
66-
lc_collate: 'en_GB.UTF-8' # override global {{ postgresql_locale }} variable per database
67-
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
6872

6973
# List of database extensions to be created (optional)
7074
postgresql_database_extensions:
@@ -87,10 +91,11 @@ postgresql_user_privileges:
8791
role_attr_flags: "CREATEDB" # role attribute flags
8892
```
8993
90-
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)
9195
9296
9397
#### Testing
98+
9499
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`
95100

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

102107
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)
103108

109+
104110
#### License
105111

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

108114

109115
#### Thanks
110116

111-
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+
112133
- [Ralph von der Heyden](https://github.com/ralph)
113134

114135

Vagrantfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ Vagrant.configure('2') do |config|
88
config.ssh.private_key_path = '~/.vagrant.d/insecure_private_key'
99

1010
config.vm.define 'anxs' do |machine|
11-
machine.vm.box = "bento/ubuntu-16.04"
11+
#machine.vm.box = "bento/ubuntu-16.04"
1212
# machine.vm.box = "ubuntu/trusty64"
1313
#machine.vm.box = "ubuntu/precise64"
1414
#machine.vm.box = "debian/jessie64"
1515
#machine.vm.box = "debian/wheezy64"
16-
#machine.vm.box = "chef/centos-7.1"
17-
#machine.vm.box = "chef/centos-6.6"
16+
machine.vm.box = "centos/7"
17+
#machine.vm.box = "centos/6"
1818

1919
machine.vm.network :private_network, ip: '192.168.88.22'
2020
machine.vm.hostname = 'anxs.local'
2121

2222
machine.vm.provision 'ansible' do |ansible|
2323
ansible.playbook = 'tests/playbook.yml'
24-
ansible.sudo = true
24+
ansible.verbose = "v"
25+
ansible.become = true
2526
ansible.inventory_path = 'vagrant-inventory'
2627
ansible.host_key_checking = false
2728
end

0 commit comments

Comments
 (0)