ARCHIVEHEADmain

7 files changed, 25 insertions, 29 deletions

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/johan/http.roundcube.internal.simponic.xyz.conf
index 09ce1a6..09ce1a6 100644
--- a/roles/private/files/europa/http.roundcube.internal.simponic.xyz.conf
+++ b/roles/private/files/johan/http.roundcube.internal.simponic.xyz.conf
diff --git a/roles/private/files/europa/https.roundcube.internal.simponic.xyz.conf b/roles/private/files/johan/https.roundcube.internal.simponic.xyz.conf
index f21b186..f21b186 100644
--- a/roles/private/files/europa/https.roundcube.internal.simponic.xyz.conf
+++ b/roles/private/files/johan/https.roundcube.internal.simponic.xyz.conf