Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Postfix cert #253

Merged
merged 2 commits into from
Dec 21, 2019
Merged

Fix Postfix cert #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3b677f
Update postfix TLS cert
SuperQ Dec 21, 2019
f733f5b
Update Caddy role.
SuperQ Dec 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ansible-lint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
exclude_paths:
- roles/antoiner77.caddy
- roles/caddy
- roles/cloudalchemy.grafana
- roles/cloudalchemy.node-exporter
- roles/cloudalchemy.prometheus
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "roles/geerlingguy.mysql"]
path = roles/geerlingguy.mysql
url = https://github.com/geerlingguy/ansible-role-mysql.git
[submodule "roles/antoiner77.caddy"]
path = roles/antoiner77.caddy
url = https://github.com/antoiner77/caddy-ansible.git
[submodule "roles/cloudalchemy.prometheus"]
path = roles/cloudalchemy.prometheus
url = https://github.com/cloudalchemy/ansible-prometheus.git
Expand All @@ -22,3 +19,6 @@
[submodule "roles/cloudalchemy.grafana"]
path = roles/cloudalchemy.grafana
url = https://github.com/cloudalchemy/ansible-grafana.git
[submodule "roles/caddy"]
path = roles/caddy
url = https://github.com/caddy-ansible/caddy-ansible.git
1 change: 0 additions & 1 deletion roles/antoiner77.caddy
Open in desktop
Submodule antoiner77.caddy deleted from f4b5c1
1 change: 1 addition & 0 deletions roles/caddy
Open in desktop
Submodule caddy added at bc3249
4 changes: 2 additions & 2 deletions roles/postfix/templates/main.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ readme_directory = no
# TLS parameters
# smtpd_tls_cert_file=/etc/postfix/noisebridge.net-cert.pem
# smtpd_tls_key_file=/etc/postfix/noisebridge.net-key.pem
smtpd_tls_cert_file=/etc/ssl/caddy/acme/acme-v01.api.letsencrypt.org/sites/noisebridge.net/noisebridge.net.crt
smtpd_tls_key_file=/etc/ssl/caddy/acme/acme-v01.api.letsencrypt.org/sites/noisebridge.net/noisebridge.net.key
smtpd_tls_cert_file=/etc/ssl/caddy/acme/acme-v02.api.letsencrypt.org/sites/noisebridge.net/noisebridge.net.crt
smtpd_tls_key_file=/etc/ssl/caddy/acme/acme-v02.api.letsencrypt.org/sites/noisebridge.net/noisebridge.net.key
smtpd_tls_ciphers = high
smtpd_use_tls=yes
smtpd_tls_exclude_ciphers = aNULL, MD5, DES, RC4-SHA, AES256-SHA, AES128-SHA
Expand Down
6 changes: 3 additions & 3 deletions site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
- cloudalchemy.node-exporter
- { role: cloudalchemy.prometheus, tags: [ 'prometheus' ] }
- { role: mydumper, tags: [ 'mydumper' ] }
- { role: antoiner77.caddy, tags: [ 'caddy' ] }
- { role: caddy, tags: [ 'caddy' ] }

- name: donate-noisebridge-net
hosts: donate-noisebridge-net
Expand All @@ -48,7 +48,7 @@
- donate
- percona
- geerlingguy.mysql
- antoiner77.caddy
- caddy
- pydonate

- name: List server
Expand Down Expand Up @@ -104,7 +104,7 @@
become_method: sudo
tags: [m4-noisebridge-net]
roles:
- { role: antoiner77.caddy, tags: [ 'caddy' ] }
- { role: caddy, tags: [ 'caddy' ] }
- { role: library-org, tags: [ 'library-org' ] }
- { role: stuff-org, tags: [ 'stuff-org' ] }

Expand Down