Commit 403cbf7e authored by nimrod's avatar nimrod
Browse files

{www.,}shore.co.il is now served by ns4, remove from host01.

parent d43e3e2c

conf.d/shore.co.il.conf

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
map $host $z_push { default z-push; }



server {

    listen      80;

    listen      [::]:80;

    server_name shore.co.il;

    include     snippets/robots-allow-all.conf;

    include     snippets/ads-txt.conf;

    include     snippets/security-txt.conf;

    location = /        { return 301 https://$host/blog/; }

    location /repo/     {

        root            /var/www/www.shore.co.il/;

        autoindex       on;

    }

    include     snippets/redirect-https.conf;

}



server {

    listen      443 ssl;

    listen      [::]:443 ssl;

    server_name shore.co.il;

    include     snippets/robots-allow-all.conf;

    include     snippets/ads-txt.conf;

    include     snippets/security-txt.conf;

    include     snippets/ssl.conf;

    include     snippets/nextcloud-well-known.conf;

    include     snippets/z-push.conf;



    location = /        { return 301 https://www.shore.co.il/blog/; }

    include     snippets/redirect-www.conf;

}

conf.d/www.shore.co.il.conf

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
server {

    listen              80;

    listen              [::]:80;

    server_name         www.shore.co.il;

    include             snippets/robots-allow-all.conf;

    include             snippets/ads-txt.conf;

    include             snippets/security-txt.conf;

    location = /        { return 301 https://$host/blog/; }

    location /repo/     {

        root            /var/www/www.shore.co.il/;

        autoindex       on;

    }

    location /          { return 301 https://$host$request_uri; }

}



server {

    listen                  443 ssl;

    listen                  [::]:443 ssl;

    server_name             www.shore.co.il;

    include                 snippets/robots-allow-all.conf;

    include                 snippets/ads-txt.conf;

    include                 snippets/security-txt.conf;

    include                 snippets/ssl.conf;

    root                    /var/www/www.shore.co.il/;

    error_page 404          /;



    location /repo/         { autoindex on; }

    location = /resume      { try_files $uri /resume/resume.html; }

    location = /resume/     { index resume.html; }



    location = /            { return 301 https://$host/blog/; }

    location /about         { return 301 https://$host/blog/pages/about-me.html; }

    location /spam          { return 301 https://$host/blog/pages/spam.html; }

    location = /blog        {

        try_files $uri /blog/index.html;

        charset UTF-8;

    }



    location /cgit          { return 301 https://git.shore.co.il/explore; }

    location /cgit/         { return 301 https://git.shore.co.il/explore; }

    location /git           { return 301 https://git.shore.co.il/explore; }

    location /git/          { return 301 https://git.shore.co.il/explore; }

}

docker-compose.yml

+3 −2
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ services: 
    build:

      context: ./

    # command: ["nginx", "-g", "daemon off;"]

    hostname: &hostname "${HOSTNAME}"

    hostname: &hostname nextcloud.shore.co.il

    networks:

      default:

        aliases:

          - *hostname

          - nextcloud.shore.co.il

          - git.shore.co.il

          - lam.shore.co.il

          - mta-sts.shore.co.il

    ports:

      - '80:80'

      - '443:443'

snippets/z-push.conf

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
location /AutoDiscover/ {

    proxy_pass          http://$z_push$request_uri;

    include             snippets/proxy-headers.conf;

}



location /Autodiscover/ {

    proxy_pass          http://$z_push$request_uri;

    include             snippets/proxy-headers.conf;

}



location /autodiscover/ {

    proxy_pass          http://$z_push$request_uri;

    include             snippets/proxy-headers.conf;

}



location /Microsoft-Server-ActiveSync {

    proxy_pass          http://$z_push$request_uri;

    include             snippets/proxy-headers.conf;

}

www/www.shore.co.il/google88c23a5c89fa3cb3.html

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
google-site-verification: google88c23a5c89fa3cb3.html
 
 No newline at end of file