Merge pull request #9 from DIVD-NL/new_website

Lets go live with the new website

deploy/.htaccess

@@ -15,31 +15,31 @@ SetEnvIfNoCase X-HTTPS-Session Yes HTTPS=on
 
 # www.divd.nl
 
-# recirect divd.nl to www
+# redirect divd.nl to www
 RewriteCond %{HTTP_HOST} ^divd\.nl [NC]
 RewriteRule (.*) https://www.divd.nl/$1 [r=301,L]
 
-# Serve www from divd-nl
-RewriteCond %{HTTP_HOST} ^www\.divd\.nl [NC]
-RewriteCond %{REQUEST_URI} !^/divd-nl [NC]
-RewriteRule (.*) divd-nl/$1 [L]
-
-# Redirect when I summon a directory without a trailing slash
-RewriteCond %{HTTP_HOST} ^www\.divd\.nl [NC]
-RewriteCond %{REQUEST_URI} ^/divd-nl.*[^/]$ [NC]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^divd-nl/(.*) /$1/ [L,r=301]
-
-## Serve www from divd-nl-2024
+## Serve www from divd-nl
 #RewriteCond %{HTTP_HOST} ^www\.divd\.nl [NC]
-#RewriteCond %{REQUEST_URI} !^/divd-nl-2024 [NC]
-#RewriteRule (.*) divd-nl-2024/$1 [L]
+#RewriteCond %{REQUEST_URI} !^/divd-nl [NC]
+#RewriteRule (.*) divd-nl/$1 [L]
 #
 ## Redirect when I summon a directory without a trailing slash
 #RewriteCond %{HTTP_HOST} ^www\.divd\.nl [NC]
-#RewriteCond %{REQUEST_URI} ^/divd-nl-2024.*[^/]$ [NC]
+#RewriteCond %{REQUEST_URI} ^/divd-nl.*[^/]$ [NC]
 #RewriteCond %{REQUEST_FILENAME} -d
-#RewriteRule ^divd-nl-2024/(.*) /$1/ [L,r=301]
+#RewriteRule ^divd-nl/(.*) /$1/ [L,r=301]
+
+# Serve www from divd-nl-2024
+RewriteCond %{HTTP_HOST} ^www\.divd\.nl [NC]
+RewriteCond %{REQUEST_URI} !^/divd-nl-2024 [NC]
+RewriteRule (.*) divd-nl-2024/$1 [L]
+
+# Redirect when I summon a directory without a trailing slash
+RewriteCond %{HTTP_HOST} ^www\.divd\.nl [NC]
+RewriteCond %{REQUEST_URI} ^/divd-nl-2024.*[^/]$ [NC]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^divd-nl-2024/(.*) /$1/ [L,r=301]
 
 # csirt.divd.nl
 
@@ -60,27 +60,27 @@ RewriteRule (.*) https://www.divd.club/$1 [r=301,L]
 
 # beta.divd.nl
 
-# Serve beta.divd.nl from divd-nl-2024
+## Serve beta.divd.nl from divd-nl-2024
+#RewriteCond %{HTTP_HOST} ^beta\.divd\.nl [NC]
+#RewriteCond %{REQUEST_URI} !^/divd-nl-2024 [NC]
+#RewriteRule (.*) divd-nl-2024/$1 [L]
+#
+## Redirect when I summon a directory without a trailing slash
+#RewriteCond %{HTTP_HOST} ^beta\.divd\.nl [NC]
+#RewriteCond %{REQUEST_URI} ^/divd-nl-2024.*[^/]$ [NC]
+#RewriteCond %{REQUEST_FILENAME} -d
+#RewriteRule ^divd-nl-2024/(.*) /$1/ [L,r=301]
+
+# Serve beta.divd.nl from divd-nl
 RewriteCond %{HTTP_HOST} ^beta\.divd\.nl [NC]
-RewriteCond %{REQUEST_URI} !^/divd-nl-2024 [NC]
-RewriteRule (.*) divd-nl-2024/$1 [L]
+RewriteCond %{REQUEST_URI} !^/divd-nl [NC]
+RewriteRule (.*) divd-nl/$1 [L]
 
 # Redirect when I summon a directory without a trailing slash
 RewriteCond %{HTTP_HOST} ^beta\.divd\.nl [NC]
-RewriteCond %{REQUEST_URI} ^/divd-nl-2024.*[^/]$ [NC]
+RewriteCond %{REQUEST_URI} ^/divd-nl.*[^/]$ [NC]
 RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^divd-nl-2024/(.*) /$1/ [L,r=301]
-
-## Serve beta.divd.nl from divd-nl
-#RewriteCond %{HTTP_HOST} ^beta\.divd\.nl [NC]
-#RewriteCond %{REQUEST_URI} !^/divd-nl [NC]
-#RewriteRule (.*) divd-nl/$1 [L]
-
-## Redirect when I summon a directory without a trailing slash
-#RewriteCond %{HTTP_HOST} ^beta\.divd\.nl [NC]
-#RewriteCond %{REQUEST_URI} ^/divd-nl.*[^/]$ [NC]
-#RewriteCond %{REQUEST_FILENAME} -d
-#RewriteRule ^divd-nl/(.*) /$1/ [L,r=301]
+RewriteRule ^divd-nl/(.*) /$1/ [L,r=301]
 
 # cyber-wear.nl
 
@@ -117,4 +117,4 @@ RewriteRule ^divd-club/(.*) /$1/ [L,r=301]
 # redirect divd.global to www.divd.nl
 RewriteCond %{HTTP_HOST} ^divd.global$ [OR]
 RewriteCond %{HTTP_HOST} ^www.divd.global$
-RewriteRule (.*)$ https://www.divd.nl/$1 [R=301,L]
+RewriteRule (.*)$ https://www.divd.nl/$1 [R=301,L]