event_web: use final domain for EH

This commit is contained in:
Markus 2023-11-14 16:49:27 +01:00
parent a5c5957554
commit 3642f4db11
3 changed files with 14 additions and 14 deletions

View File

@ -1,13 +1,13 @@
--- ---
eh2x.binary-kitchen.de: eh21.easterhegg.eu:
- path: /etc/nginx/ssl/eh2x.binary-kitchen.de.crt - path: /etc/nginx/ssl/eh21.easterhegg.eu.crt
user: root user: root
group: root group: root
perm: '400' perm: '400'
format: crt,ca format: crt,ca
action: '/usr/sbin/service nginx restart' action: '/usr/sbin/service nginx restart'
- path: /etc/nginx/ssl/eh2x.binary-kitchen.de.key - path: /etc/nginx/ssl/eh21.easterhegg.eu.key
user: root user: root
group: root group: root
perm: '400' perm: '400'

View File

@ -2,7 +2,7 @@ server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name eh2x.binary-kitchen.de; server_name eh21.easterhegg.eu;
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
default_type "text/plain"; default_type "text/plain";
@ -10,7 +10,7 @@ server {
} }
location / { location / {
return 301 https://eh2x.binary-kitchen.de$request_uri; return 301 https://eh21.easterhegg.eu$request_uri;
} }
} }
@ -18,10 +18,10 @@ server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
server_name eh2x.binary-kitchen.de; server_name eh21.easterhegg.eu;
ssl_certificate_key /etc/nginx/ssl/eh2x.binary-kitchen.de.key; ssl_certificate_key /etc/nginx/ssl/eh21.easterhegg.eu.key;
ssl_certificate /etc/nginx/ssl/eh2x.binary-kitchen.de.crt; ssl_certificate /etc/nginx/ssl/eh21.easterhegg.eu.crt;
root /var/www/eh2x; root /var/www/eh21;
} }

View File

@ -6,15 +6,15 @@
- php-fpm - php-fpm
- name: Create vhost directory - name: Create vhost directory
file: path=/var/www/eh2x state=directory owner=www-data group=www-data file: path=/var/www/eh21 state=directory owner=www-data group=www-data
- name: Ensure certificates are available - name: Ensure certificates are available
command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/eh2x.binary-kitchen.de.key -out /etc/nginx/ssl/eh2x.binary-kitchen.de.crt -days 730 -subj "/CN=eh2x.binary-kitchen.de" creates=/etc/nginx/ssl/eh2x.binary-kitchen.de.crt command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/eh21.easterhegg.eu.key -out /etc/nginx/ssl/eh21.easterhegg.eu.crt -days 730 -subj "/CN=eh21.easterhegg.eu" creates=/etc/nginx/ssl/eh21.easterhegg.eu.crt
notify: Restart nginx notify: Restart nginx
#- name: Configure certificate manager - name: Configure certificate manager
# copy: src=certs dest=/etc/acertmgr/eh2x.binary-kitchen.de.conf copy: src=certs dest=/etc/acertmgr/eh21.easterhegg.eu.conf
# notify: Run acertmgr notify: Run acertmgr
- name: Configure vhosts - name: Configure vhosts
copy: src=vhost dest=/etc/nginx/sites-available/www copy: src=vhost dest=/etc/nginx/sites-available/www