From 4eb2e6990db54cb99b0fc738b3624ce75be09415 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Fri, 1 Aug 2025 03:04:07 -0400 Subject: ARCHIVE --- group_vars/nameservers.yml | 4 +-- inventory | 8 ++--- roles/nameservers/tasks/main.yml | 36 +++++++++++----------- roles/nameservers/templates/db.simponic.xyz.j2 | 4 +-- .../templates/named.conf.local.primary.j2 | 2 +- .../http.roundcube.internal.simponic.xyz.conf | 13 -------- .../https.roundcube.internal.simponic.xyz.conf | 32 ------------------- .../http.roundcube.internal.simponic.xyz.conf | 13 ++++++++ .../https.roundcube.internal.simponic.xyz.conf | 32 +++++++++++++++++++ 9 files changed, 70 insertions(+), 74 deletions(-) delete mode 100644 roles/private/files/europa/http.roundcube.internal.simponic.xyz.conf delete mode 100644 roles/private/files/europa/https.roundcube.internal.simponic.xyz.conf create mode 100644 roles/private/files/johan/http.roundcube.internal.simponic.xyz.conf create mode 100644 roles/private/files/johan/https.roundcube.internal.simponic.xyz.conf diff --git a/group_vars/nameservers.yml b/group_vars/nameservers.yml index db4d959..9599d7e 100644 --- a/group_vars/nameservers.yml +++ b/group_vars/nameservers.yml @@ -2,7 +2,7 @@ dns_zones: - zone: simponic.xyz - zone: rainrainra.in - zone: rileyandlizzy.wedding -dns_primary_hostname: ryo +dns_primary_hostname: nijika dns_replica_hostname: nijika -dns_primary_ip: 107.173.19.33 +dns_primary_ip: 107.172.103.253 dns_replica_ip: 107.172.103.253 diff --git a/inventory b/inventory index 826318d..2490b16 100644 --- a/inventory +++ b/inventory @@ -14,7 +14,7 @@ levi.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh mail.simponic.xyz ansible_user=root ansible_connection=ssh [private] -johan.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh +johan ansible_user=root ansible_connection=ssh europa.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh raspberrypi.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh @@ -24,13 +24,9 @@ nijika.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh ryo.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh [nameservers] -ryo.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh nijika.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh [dnsprimary] -ryo.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh - -[dnsreplica] nijika.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh [vpn] @@ -58,7 +54,7 @@ johan.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh mail.simponic.xyz ansible_user=root ansible_connection=ssh [roundcube] -europa.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh +johan.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh [scurvy] europa.sys.internal.simponic.xyz ansible_user=root ansible_connection=ssh diff --git a/roles/nameservers/tasks/main.yml b/roles/nameservers/tasks/main.yml index c781ae7..96c6e7c 100644 --- a/roles/nameservers/tasks/main.yml +++ b/roles/nameservers/tasks/main.yml @@ -29,21 +29,21 @@ ## REPLICA -- name: create named.conf.local for replica - template: - src: ../templates/named.conf.local.replica.j2 - dest: /etc/bind/named.conf.local - owner: bind - group: bind - when: inventory_hostname in groups['dnsreplica'] - -- name: flush dns cache on replicas - file: path={{ item }} state=absent - with_fileglob: "/var/cache/bind/db.*" - when: inventory_hostname in groups['dnsreplica'] - -- name: restart bind9 - service: - name: bind9 - state: restarted - enabled: true + #- name: create named.conf.local for replica + # template: + # src: ../templates/named.conf.local.replica.j2 + # dest: /etc/bind/named.conf.local + # owner: bind + # group: bind + # when: inventory_hostname in groups['dnsreplica'] + # + #- name: flush dns cache on replicas + # file: path={{ item }} state=absent + # with_fileglob: "/var/cache/bind/db.*" + # when: inventory_hostname in groups['dnsreplica'] + # + #- name: restart bind9 + # service: + # name: bind9 + # state: restarted + # enabled: true diff --git a/roles/nameservers/templates/db.simponic.xyz.j2 b/roles/nameservers/templates/db.simponic.xyz.j2 index 7494f83..7b8d44b 100644 --- a/roles/nameservers/templates/db.simponic.xyz.j2 +++ b/roles/nameservers/templates/db.simponic.xyz.j2 @@ -9,11 +9,11 @@ $TTL 604800 ; Name servers simponic.xyz. IN NS {{ dns_primary_hostname }}.simponic.xyz. -simponic.xyz. IN NS {{ dns_replica_hostname }}.simponic.xyz. +; simponic.xyz. IN NS {{ dns_replica_hostname }}.simponic.xyz. ;; A Records {{ dns_primary_hostname }} IN A {{ dns_primary_ip }} -{{ dns_replica_hostname }} IN A {{ dns_replica_ip }} +; {{ dns_replica_hostname }} IN A {{ dns_replica_ip }} johan.simponic.xyz. 1 IN A 23.95.20.192 osaka.simponic.xyz. 1 IN A 129.123.76.14 diff --git a/roles/nameservers/templates/named.conf.local.primary.j2 b/roles/nameservers/templates/named.conf.local.primary.j2 index 18a0532..2756490 100644 --- a/roles/nameservers/templates/named.conf.local.primary.j2 +++ b/roles/nameservers/templates/named.conf.local.primary.j2 @@ -2,6 +2,6 @@ zone "{{ zone.zone }}" { type master; file "/etc/bind/zones/db.{{ zone.zone }}"; - allow-transfer { {{ dns_replica_ip }}; }; +# allow-transfer { {{ dns_replica_ip }}; }; }; {% endfor %} diff --git a/roles/private/files/europa/http.roundcube.internal.simponic.xyz.conf b/roles/private/files/europa/http.roundcube.internal.simponic.xyz.conf deleted file mode 100644 index 09ce1a6..0000000 --- a/roles/private/files/europa/http.roundcube.internal.simponic.xyz.conf +++ /dev/null @@ -1,13 +0,0 @@ -server { - listen 80; - server_name roundcube.internal.simponic.xyz; - - location /.well-known/acme-challenge { - root /var/www/letsencrypt; - try_files $uri $uri/ =404; - } - - location / { - rewrite ^ https://roundcube.internal.simponic.xyz$request_uri? permanent; - } -} diff --git a/roles/private/files/europa/https.roundcube.internal.simponic.xyz.conf b/roles/private/files/europa/https.roundcube.internal.simponic.xyz.conf deleted file mode 100644 index f21b186..0000000 --- a/roles/private/files/europa/https.roundcube.internal.simponic.xyz.conf +++ /dev/null @@ -1,32 +0,0 @@ -server { - listen 443 ssl; - server_name roundcube.internal.simponic.xyz; - - ssl_certificate /etc/letsencrypt/live/roundcube.internal.simponic.xyz/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/roundcube.internal.simponic.xyz/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/roundcube.internal.simponic.xyz/fullchain.pem; - - ssl_session_cache shared:SSL:50m; - ssl_session_timeout 5m; - ssl_stapling on; - ssl_stapling_verify on; - - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - ssl_dhparam /etc/nginx/dhparams.pem; - ssl_prefer_server_ciphers on; - - location / { - proxy_pass http://127.0.0.1:9002; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $server_name; - proxy_buffering off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; - add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; - } -} diff --git a/roles/private/files/johan/http.roundcube.internal.simponic.xyz.conf b/roles/private/files/johan/http.roundcube.internal.simponic.xyz.conf new file mode 100644 index 0000000..09ce1a6 --- /dev/null +++ b/roles/private/files/johan/http.roundcube.internal.simponic.xyz.conf @@ -0,0 +1,13 @@ +server { + listen 80; + server_name roundcube.internal.simponic.xyz; + + location /.well-known/acme-challenge { + root /var/www/letsencrypt; + try_files $uri $uri/ =404; + } + + location / { + rewrite ^ https://roundcube.internal.simponic.xyz$request_uri? permanent; + } +} diff --git a/roles/private/files/johan/https.roundcube.internal.simponic.xyz.conf b/roles/private/files/johan/https.roundcube.internal.simponic.xyz.conf new file mode 100644 index 0000000..f21b186 --- /dev/null +++ b/roles/private/files/johan/https.roundcube.internal.simponic.xyz.conf @@ -0,0 +1,32 @@ +server { + listen 443 ssl; + server_name roundcube.internal.simponic.xyz; + + ssl_certificate /etc/letsencrypt/live/roundcube.internal.simponic.xyz/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/roundcube.internal.simponic.xyz/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/roundcube.internal.simponic.xyz/fullchain.pem; + + ssl_session_cache shared:SSL:50m; + ssl_session_timeout 5m; + ssl_stapling on; + ssl_stapling_verify on; + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + + ssl_dhparam /etc/nginx/dhparams.pem; + ssl_prefer_server_ciphers on; + + location / { + proxy_pass http://127.0.0.1:9002; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $server_name; + proxy_buffering off; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; + add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; + } +} -- cgit v1.2.3-70-g09d2