merge with public version

2 files changed, 34 insertions, 2 deletions

diff --git a/platform/etc/nginx/www.conf.sample b/platform/etc/nginx/www.conf.sample
index cacddaa..1243549 100644
--- a/platform/etc/nginx/www.conf.sample
+++ b/platform/etc/nginx/www.conf.sample
@@ -1,6 +1,6 @@
 server {
     listen         80;
-    server_name acerv.uz *.acerv.uz;
+    server_name acerv.us *.acerv.us;
     root    /srv/acerv.us/platform/www/;
     error_log  /srv/acerv.us/platform/log/nginx.error error;
 
@@ -40,3 +40,35 @@ server {
 		fastcgi_buffering off;
     }
 }
+
+# Define the subsites
+
+server {
+    if ($host = esteva.acerv.us) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+
+    if ($host = cidoc.acerv.us) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+
+    if ($host = illich.acerv.us) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+
+    if ($host = acerv.us) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+    if ($host = *.acerv.us) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+    listen         80;
+    server_name acerv.us *.acerv.us;
+    return 404; # managed by Certbot
+
+}
diff --git a/platform/etc/php-fpm/www.conf.sample b/platform/etc/php-fpm/www.conf.sample
index fe61ee1..2d0a9ad 100644
--- a/platform/etc/php-fpm/www.conf.sample
+++ b/platform/etc/php-fpm/www.conf.sample
@@ -47,7 +47,7 @@ php_admin_value[memory_limit] = 128M
 php_admin_value[post_max_size] = 12M
 php_admin_value[upload_max_filesize] = 10M
 
-; php_admin_value[session.cookie_domain] = .acervu.us
+; php_admin_value[session.cookie_domain] = .acerv.us
 
 php_admin_value[cgi.fix_pathinfo] = 1
 php_admin_value[session.save_path] = /srv/acerv.us/platform/tmp/