From 8acf8086a1ba37545074cac125e79d94b168afbf Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Mon, 14 Nov 2022 16:05:08 +0100
Subject: [PATCH] [inspircd] Update configuration

---
 host_vars/irc.adm.crans.org.yml               | 25 ++++++++++---------
 roles/anope/templates/anope/services.conf.j2  |  2 +-
 .../templates/inspircd/modules.conf.j2        |  4 +--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/host_vars/irc.adm.crans.org.yml b/host_vars/irc.adm.crans.org.yml
index 1e528069..bfd16929 100644
--- a/host_vars/irc.adm.crans.org.yml
+++ b/host_vars/irc.adm.crans.org.yml
@@ -42,15 +42,15 @@ loc_inspircd:
     nick: PEB
     email: root@crans.org
   bind:
-    - address: 185.230.79.11
+    - address: "{{ query('ldap', 'ip', 'irc', 'srv') | ansible.utils.ipv4 | first }}"
       type: clients
       clair: 6667
       ssl: 6697
-    - address: 2a0c:700:2::ff:fe01:2902
+    - address: "{{ query('ldap', 'ip', 'irc', 'srv') | ansible.utils.ipv6 | first }}"
       type: clients
       clair: 6667
       ssl: 6697
-    - address: 172.16.10.129
+    - address: "{{ query('ldap', 'ip', 'irc', 'adm') | ansible.utils.ipv4 | first }}"
       type: clients
       clair: 6667
     - address: 127.0.0.1
@@ -59,28 +59,28 @@ loc_inspircd:
   connect:
     - name: zamok
       allows:
-        ipv4: 185.230.79.1/32
-        ipv6: 2a0c:700:2:0:ec4:7aff:fe59:a1ad/128
+        ipv4: "{{ query('ldap', 'ip', 'zamok', 'srv') | ansible.utils.ipv4 | first }}/32"
+        ipv6: "{{ query('ldap', 'ip', 'zamok', 'srv') | ansible.utils.ipv6 | first }}/128"
       threshold: 1
     - name: irc
       allows:
-        ipv4: 185.230.79.11/32
-        ipv6: 2a0c:700:2::ff:fe01:2902/128
+        ipv4: "{{ query('ldap', 'ip', 'irc', 'srv') | ansible.utils.ipv4 | first }}/32"
+        ipv6: "{{ query('ldap', 'ip', 'irc', 'srv') | ansible.utils.ipv6 | first }}/128"
       threshold: 1
     - name: gitlab
       allows:
-        ipv4: 185.230.79.14/32
-        ipv6: 2a0c:700:2::ff:fe01:502/128
+        ipv4: "{{ query('ldap', 'ip', 'gitzly', 'srv') | ansible.utils.ipv4 | first }}/32"
+        ipv6: "{{ query('ldap', 'ip', 'gitzly', 'srv') | ansible.utils.ipv6 | first }}/128"
       threshold: 10
       commandrate: 10000
     - name: monitoring
       allows:
-        ipv4: 172.16.10.121/32
-        ipv6: fd00::10:ff:fe01:2110/128
+        ipv4: "{{ query('ldap', 'ip', 'fyre', 'adm') | ansible.utils.ipv4 | first }}/32"
+        ipv6: "{{ query('ldap', 'ip', 'fyre', 'adm') | ansible.utils.ipv6 | first }}/128"
       threshold: 10
       commandrate: 10000
       modes: true
-  dns: 185.230.79.62
+  dns: "{{ query('ldap', 'ip', 'romanesco', 'srv') | ansible.utils.ipv4 | first }}"
   services:
     name: services.irc.crans.org
     port: 6668
@@ -92,3 +92,4 @@ loc_anope:
   sendpass: "{{ vault.anope.sendpass }}"
   options_seed: "{{ vault.anope.options_seed }}"
   services_roots: "{{ vault.anope.services_roots }}"
+  services_host: "services.irc.crans.org"
diff --git a/roles/anope/templates/anope/services.conf.j2 b/roles/anope/templates/anope/services.conf.j2
index 29fb8294..3470255e 100644
--- a/roles/anope/templates/anope/services.conf.j2
+++ b/roles/anope/templates/anope/services.conf.j2
@@ -94,7 +94,7 @@
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "{{ anope.services_host }}"
 }
 
 /*
diff --git a/roles/inspircd/templates/inspircd/modules.conf.j2 b/roles/inspircd/templates/inspircd/modules.conf.j2
index ab311ad3..93e93f28 100644
--- a/roles/inspircd/templates/inspircd/modules.conf.j2
+++ b/roles/inspircd/templates/inspircd/modules.conf.j2
@@ -24,8 +24,8 @@
 <auditorium  opvisible="yes" opcansee="no" opercansee="yes">
 <module name="m_banexception.so">
 <module name="m_banredirect.so">
-<module name="m_blockamsg.so">
-   <blockamsg delay="3" action="noticeopers">
+#<module name="m_blockamsg.so">
+#   <blockamsg delay="3" action="noticeopers">
 
 <module name="m_blockcaps.so">
 <blockcaps percent="50"