infra
/
ansible
4
5
Fork 5
Code Issues 6 Pull Requests Activity

Compare commits

base: infra:master
Branches Tags
infra:master
infra:kea
infra:pizza
kishi:master
kishi:mailman3-nginx
kishi:mailman3web
kishi:mailman3
kishi:oldmaster
kishi:mail
..
compare: kishi:master
Branches Tags
kishi:master
kishi:mailman3-nginx
kishi:mailman3web
kishi:mailman3
kishi:oldmaster
kishi:mail
infra:master
infra:kea
infra:pizza

No commits in common. "master" and "master" have entirely different histories.
master ... master

6 changed files with 4 additions and 102 deletions
Show Stats Expand all files Collapse all files

2
roles/gitea/defaults/main.yml
View File

@ -3,5 +3,5 @@
gitea_user: gogs
gitea_group: gogs
gitea_version: 1.21.11
gitea_version: 1.21.10
gitea_url: https://github.com/go-gitea/gitea/releases/download/v{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64

2
roles/netbox/defaults/main.yml
View File

@ -2,4 +2,4 @@
netbox_group: netbox
netbox_user: netbox
netbox_version: 3.7.5
netbox_version: 3.7.4

14
roles/web/files/certs
View File

@ -14,20 +14,6 @@ www.binary-kitchen.de binary-kitchen.de www.binary.kitchen binary.kitchen:
format: key
action: '/usr/sbin/service nginx restart'
autoconfig.binary-kitchen.de:
- path: /etc/nginx/ssl/autoconfig.binary-kitchen.de.crt
user: root
group: root
perm: '400'
format: crt,ca
action: '/usr/sbin/service nginx restart'
- path: /etc/nginx/ssl/autoconfig.binary-kitchen.de.key
user: root
group: root
perm: '400'
format: key
action: '/usr/sbin/service nginx restart'
www.ccc-r.de:
- path: /etc/nginx/ssl/www.ccc-r.de.crt
user: root

30
roles/web/files/vhost
View File

@ -85,36 +85,6 @@ server {
}
}
server {
listen 80;
listen [::]:80;
server_name autoconfig.binary-kitchen.de;
location /.well-known/acme-challenge {
default_type "text/plain";
alias /var/www/acme-challenge;
}
location / {
return 301 https://autoconfig.binary-kitchen.de$request_uri;
}
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name autoconfig.binary-kitchen.de;
ssl_certificate_key /etc/nginx/ssl/autoconfig.binary-kitchen.de.key;
ssl_certificate /etc/nginx/ssl/autoconfig.binary-kitchen.de.crt;
root /var/www/autconfig;
default_type text/html;
}
server {
listen 80;
listen [::]:80;

17
roles/web/tasks/main.yml
View File

@ -8,23 +8,13 @@
- php-sqlite3
- php-xml
- name: Create vhost directories
file: path=/var/www/{{ item }} state=directory owner=www-data group=www-data
with_items:
- autoconfig
- autoconfig/mail
- ccc-r
- makerspace-regensburg
- kitchen
- name: Create vhost directory
file: path=/var/www/kitchen state=directory owner=www-data group=www-data
- name: Ensure (BK) certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/www.binary-kitchen.de.key -out /etc/nginx/ssl/www.binary-kitchen.de.crt -days 730 -subj "/CN=www.binary-kitchen.de" creates=/etc/nginx/ssl/www.binary-kitchen.de.crt
notify: Restart nginx
- name: Ensure (BK autodiscover) certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/autoconfig.binary-kitchen.de.key -out /etc/nginx/ssl/autoconfig.binary-kitchen.de.crt -days 730 -subj "/CN=autoconfig.binary-kitchen.de" creates=/etc/nginx/ssl/autoconfig.binary-kitchen.de.crt
notify: Restart nginx
- name: Ensure (CCC-R) certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/www.ccc-r.de.key -out /etc/nginx/ssl/www.ccc-r.de.crt -days 730 -subj "/CN=www.ccc-r.de" creates=/etc/nginx/ssl/www.ccc-r.de.crt
notify: Restart nginx
@ -33,9 +23,6 @@
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/www.makerspace-regensburg.de.key -out /etc/nginx/ssl/www.makerspace-regensburg.de.crt -days 730 -subj "/CN=www.makerspace-regensburg.de" creates=/etc/nginx/ssl/www.makerspace-regensburg.de.crt
notify: Restart nginx
- name: Place Thunderbird autoconfig file
template: src=auto_mail.xml.j2 dest=/var/www/autoconfig/mail/config-v1.1.xml
- name: Configure certificate manager
copy: src=certs dest=/etc/acertmgr/www.binary-kitchen.de.conf
notify: Run acertmgr

41
roles/web/templates/auto_mail.xml.j2
View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<clientConfig version="1.1">
<emailProvider id="binary-kitchen.de">
<domain>{{ mail_domain }}</domain>
<displayName>Binary Kitchen</displayName>
<displayShortName>Binary Kitchen</displayShortName>
<incomingServer type="imap">
<hostname>{{ mail_server }}</hostname>
<port>993</port>
<socketType>SSL</socketType>
<authentication>password-encrypted</authentication>
<username>%EMAILLOCALPART%</username>
</incomingServer>
<incomingServer type="imap">
<hostname>{{ mail_server }}</hostname>
<port>143</port>
<socketType>STARTTLS</socketType>
<authentication>password-encrypted</authentication>
<username>%EMAILLOCALPART%</username>
</incomingServer>
<outgoingServer type="smtp">
<hostname>{{ mail_server }}</hostname>
<port>465</port>
<socketType>SSL</socketType>
<authentication>password-encrypted</authentication>
<username>%EMAILLOCALPART%</username>
</outgoingServer>
<outgoingServer type="smtp">
<hostname>{{ mail_server }}</hostname>
<port>587</port>
<socketType>STARTTLS</socketType>
<authentication>password-encrypted</authentication>
<username>%EMAILLOCALPART%</username>
</outgoingServer>
<documentation url="https://www.binary-kitchen.de/wiki/infra:start#e-mail">
<descr lang="de">Beschreibung der Einstellungen</descr>
<descr lang="en">Generic settings description</descr>
</documentation>
</emailProvider>
</clientConfig>