✨: redirect nintendojofr.com to nintendojo.fr

group_vars/nsdservers.yml

@@ -9,7 +9,6 @@ zones:
     parking: true
   - name: nintendojo.fr
   - name: nintendojofr.com
-    parking: true
   - name: nupes.social
     parking: true
   - name: pipoworld.fr

production.yml

@@ -143,6 +143,9 @@ webservers:
         - nintendojo.fr
         - www.nintendojo.fr
         - forum.nintendojo.fr
+        - nintendojofr.com
+        - www.nintendojofr.com
+        - forum.nintendojofr.com
     web3.dmz.mateu.be:
       web_hostname:
         - sebicomics.com

roles/nginx/templates/vhosts/forum.nintendojofr.com.conf.j2

@@ -0,0 +1,9 @@
+server {
+{% include './templates/header.conf.j2' %}
+	root /srv/http/forum.nintendojofr.com/;
+	index index.html index.htm index.php;
+	
+	location / {
+		return 301 https://forum.nintendojo.fr$request_uri;
+	}
+}

roles/nginx/templates/vhosts/web.garage.mateu.be.conf.j2

@@ -1,14 +0,0 @@
-server {
-{% include './templates/header.conf.j2' %}
-
-	location / {
-		proxy_pass http://web_backend_{{ item.split('.')|join('_') }};
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header Host $host;
-	}
-}
-
-upstream web_backend_{{ item.split('.')|join('_') }} {
-	# If you have a garage instance locally.
-	server [::1]:3902;
-}

roles/nginx/templates/vhosts/www.intendo.fr.conf.j2

@@ -1,16 +0,0 @@
-server {
-	listen *:443 ssl http2;
-	listen [::]:443 ssl http2;
-	ssl_certificate /etc/x509/intendo.fr/fullchain.cer;
-	ssl_certificate_key /etc/x509/intendo.fr/intendo.fr.key;
-	server_name intendo.fr www.intendo.fr;
-	access_log /var/log/intendo.fr.access.log combined;
-	access_log syslog:server=unix:/dev/log combined;
-	error_log /var/log/intendo.fr.error.log;
-	error_log syslog:server=unix:/dev/log;
-	
-	location / {
-		return 302 https://www.nintendojo.fr$request_uri;
-	}
-}
-

roles/nginx/templates/vhosts/www.nintendojofr.com.conf.j2

@@ -0,0 +1,19 @@
+## WP NintendojoFR
+server {
+	listen *:443 ssl http2;
+	listen [::]:443 ssl http2;
+	server_name nintendojofr.com www.nintendojofr.com;
+	access_log /var/log/nginx/nintendojofr.com.access.log combined;
+	access_log syslog:server=unix:/dev/log combined;
+	error_log /var/log/nginx/nintendojofr.com.error.log;
+	error_log syslog:server=unix:/dev/log;
+	ssl_certificate /etc/x509/nintendojofr.com/fullchain.cer;
+	ssl_certificate_key /etc/x509/nintendojofr.com/nintendojofr.com.key;
+
+	root /srv/http/www.nintendojofr.com/;
+	index index.html index.htm index.php;
+
+	location / {
+		return 301 https://www.nintendojo.fr;
+	}
+}

roles/nsd/templates/zones/nintendojofr.com.zone.j2

@@ -0,0 +1,22 @@
+$TTL 86400
+@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
+				{{ dns_serial }}; timestamp serial number
+				28800; Refresh
+				7200; Retry
+				864000; Expire
+				86400; Min TTL
+			)
+
+{% for server in groups['nsdservers'] %}
+@		IN NS {{ server }}.
+{% endfor %}
+
+$ORIGIN {{ item.name }}.
+@		IN CAA 0 issue "letsencrypt.org"
+@		IN MX 0 .
+@		IN A 82.66.135.228
+@		IN AAAA 2a01:e0a:9bd:2811::6
+@		IN TXT "v=spf1 -all"
+@		IN TXT "spf2.0/mfrom -all"
+_dmarc		IN TXT "v=DMARC1;p=reject;pct=100;sp=reject;aspf=s;"
+{{ web_hostname_block }}