Compare commits
1 commit
c307e81d9f
...
66d6e54cf1
Author | SHA1 | Date | |
---|---|---|---|
66d6e54cf1 |
5 changed files with 4 additions and 97 deletions
|
@ -64,9 +64,11 @@ server {
|
||||||
fastcgi_pass unix:/var/run/php/php-fpm-dokuwiki.sock;
|
fastcgi_pass unix:/var/run/php/php-fpm-dokuwiki.sock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location = /design {
|
||||||
|
return 302 https://eh22.easterhegg.eu/design/;
|
||||||
|
}
|
||||||
|
|
||||||
location /design/ {
|
location /design/ {
|
||||||
# Disable port in redirect as NGINX would redirect to the PROXY Protocol port 8443 for locations like https://eh22.easterhegg.eu/design
|
|
||||||
port_in_redirect off;
|
|
||||||
alias /var/www/eh22-styleguide/;
|
alias /var/www/eh22-styleguide/;
|
||||||
index index.html;
|
index index.html;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
# Role `postgresql`
|
|
||||||
|
|
||||||
Ensures `postgresql` is installed by installing the distributions package.
|
|
||||||
Also ensures the optionally given databases and users are set up as specified.
|
|
||||||
|
|
||||||
## Supported Distributions
|
|
||||||
|
|
||||||
Should work on Debian-based distributions.
|
|
||||||
|
|
||||||
## Required Arguments
|
|
||||||
|
|
||||||
None.
|
|
||||||
|
|
||||||
## Optional Arguments
|
|
||||||
|
|
||||||
- `postgresql__dbs`: List of databases with their owner to ensure are set up.
|
|
||||||
- `postgresql__dbs.*.name`: Name of the database.
|
|
||||||
- `postgresql__dbs.*.owner`: Owner of the database.
|
|
||||||
- `postgresql__users`: List of users to ensure are set up.
|
|
||||||
- `postgresql__users.*.name`: Name of the user.
|
|
||||||
- `postgresql__users.*.password`: Optional password for the user.
|
|
||||||
If left unset, the user will have no password set, but can still connect using [peer authentication](https://www.postgresql.org/docs/current/auth-peer.html) on the local system.
|
|
||||||
(Peer authentication works when a password is set as well.)
|
|
||||||
|
|
||||||
## Example Arguments
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
postgresql__dbs:
|
|
||||||
- name: netbox
|
|
||||||
owner: netbox
|
|
||||||
- name: foo
|
|
||||||
owner: bar
|
|
||||||
postgresql__users:
|
|
||||||
- name: netbox
|
|
||||||
password: super_secret
|
|
||||||
- name: bar
|
|
||||||
```
|
|
|
@ -1,2 +0,0 @@
|
||||||
postgresql__dbs: [ ]
|
|
||||||
postgresql__users: [ ]
|
|
|
@ -1,28 +0,0 @@
|
||||||
argument_specs:
|
|
||||||
main:
|
|
||||||
options:
|
|
||||||
postgresql__dbs:
|
|
||||||
type: list
|
|
||||||
elements: dict
|
|
||||||
required: false
|
|
||||||
default: [ ]
|
|
||||||
options:
|
|
||||||
name:
|
|
||||||
type: str
|
|
||||||
required: true
|
|
||||||
owner:
|
|
||||||
type: str
|
|
||||||
required: true
|
|
||||||
postgresql__users:
|
|
||||||
type: list
|
|
||||||
elements: dict
|
|
||||||
required: false
|
|
||||||
default: [ ]
|
|
||||||
options:
|
|
||||||
name:
|
|
||||||
type: str
|
|
||||||
required: true
|
|
||||||
password:
|
|
||||||
type: str
|
|
||||||
required: false
|
|
||||||
default: ""
|
|
|
@ -1,28 +0,0 @@
|
||||||
- name: Ensure postgresql is installed
|
|
||||||
ansible.builtin.apt:
|
|
||||||
name:
|
|
||||||
- postgresql
|
|
||||||
become: true
|
|
||||||
|
|
||||||
- name: Ensure Python library for community.postgresql is installed if needed
|
|
||||||
ansible.builtin.apt:
|
|
||||||
name:
|
|
||||||
- python3-psycopg
|
|
||||||
become: true
|
|
||||||
when: postgresql__dbs != [ ] or postgresql__users != [ ]
|
|
||||||
|
|
||||||
- name: Ensure users
|
|
||||||
community.postgresql.postgresql_user:
|
|
||||||
name: "{{ item.name }}"
|
|
||||||
password: "{{ item.password | default('') }}"
|
|
||||||
become: true
|
|
||||||
become_user: postgres
|
|
||||||
loop: "{{ postgresql__users }}"
|
|
||||||
|
|
||||||
- name: Ensure dbs with owners
|
|
||||||
community.postgresql.postgresql_db:
|
|
||||||
name: "{{ item.name }}"
|
|
||||||
owner: "{{ item.owner }}"
|
|
||||||
become: true
|
|
||||||
become_user: postgres
|
|
||||||
loop: "{{ postgresql__dbs }}"
|
|
Loading…
Add table
Add a link
Reference in a new issue