drop obsolete alamut, jonund, valstar stuff

5 files changed, 3 insertions, 30 deletions

diff --git a/deployment/backups/manifests/init.pp b/deployment/backups/manifests/init.pp
index e8ddb796..ba2d16d5 100644
--- a/deployment/backups/manifests/init.pp
+++ b/deployment/backups/manifests/init.pp
@@ -15,11 +15,6 @@ class backups {
             mode   => '0700',
         }
 
-        rsnapshot::backup{ 'alamut':
-            snapshot_root => "${backups_dir}/alamut",
-            backup        => [ "root@alamut.${::domain}:/srv/wiki wiki" ],
-        }
-
         rsnapshot::backup{ 'neru':
             snapshot_root => "${backups_dir}/neru",
             backup        => [ "root@neru.${::domain}:/home/irc_bots/meetings meetbot" ],
diff --git a/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone b/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone
index db085396..6dfee4ff 100644
--- a/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone
+++ b/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone
@@ -1,6 +1,6 @@
 $TTL 3D
 @   IN  SOA ns0.mageia.org. root.mageia.org. (
-        2016020501  ; Serial
+        2019070601  ; Serial
         3600        ; Refresh
         3600        ; Retry
         2419200     ; Expire
@@ -12,10 +12,7 @@ $TTL 3D
 @	IN      NS      ns1.mageia.org.
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR gw-ipv6.mageia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR alamut.mageia.org.
-3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR valstar.mageia.org.
 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR ecosse.mageia.org.
-5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR jonund.mageia.org.
 6.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR fiona.mageia.org.
 7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR sucuk.mageia.org.
 8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN  PTR rabbit.mageia.org.
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index cda51417..e8a6b1f1 100755..100644
--- a/deployment/dns/templates/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
@@ -7,7 +7,7 @@
 ; $Id$
 $TTL	30m
 @       IN      SOA     ns0.mageia.org.   root.mageia.org.  (
-        2019070301	; Serial
+        2019070601	; Serial
         7200		; Refresh
         3600		; Retry
         86400		; Expire
@@ -44,10 +44,6 @@ group  IN      MX 20   neru.mageia.org.
 <%= nodes_txt %>
 
 ;SSHFP
-alamut      IN SSHFP 1 1 ef093dc95002c4af6623f02238749fd59fe81eec
-alamut      IN SSHFP 2 1 179cfa0660550698c4d98f488772b7c7896d96b5
-valstar     IN SSHFP 1 1 f08e336f678d7c4a8772f17770976af7dd4d7a4f
-valstar     IN SSHFP 2 1 c0c45ed25aa8a9f1723a1ae077dcee61677a56a6
 
 ; sucuk
 ns0         IN  A       <%= nodes['sucuk']['ipv4'] %>
@@ -66,9 +62,6 @@ madb        IN  A       163.172.201.211
 ; since we have a subdomain, we cannot use a CNAME
 ml          IN  A       <%= nodes['sucuk']['ipv4'] %>
 ml          IN  AAAA    <%= nodes['sucuk']['ipv6'] %>
-; mga torrent server and tracker
-torrent      IN  A       <%= nodes['alamut']['ipv4'] %>
-torrent      IN  AAAA    <%= nodes['alamut']['ipv6'] %>
 
 ; aliases
 ldap-slave-1 IN CNAME neru
@@ -98,11 +91,9 @@ ldap        IN CNAME duvel
 ldap-master IN CNAME duvel
 advisories  IN CNAME duvel
 projects    IN CNAME duvel
-pgsql       IN CNAME alamut
 bcd	    IN CNAME rabbit
 
 epoll       IN CNAME sucuk
-tmp	    IN CNAME alamut
 forums      IN CNAME sucuk
 forum       IN CNAME sucuk
 
@@ -124,8 +115,6 @@ www         IN CNAME sucuk
 xymon       IN CNAME sucuk
 
 ; build nodes aliases
-jonund0 IN CNAME jonund
-jonund1 IN CNAME jonund
 ecosse0 IN CNAME ecosse
 ecosse1 IN CNAME ecosse
 rabbit0 IN CNAME rabbit
diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf
index 650d1187..3c093d4b 100644
--- a/deployment/main_mirror/templates/rsyncd.conf
+++ b/deployment/main_mirror/templates/rsyncd.conf
@@ -9,7 +9,6 @@ gid = nogroup
     hosts allow = \
         10.42.0.0/24 \
         rabbit.<%= domain %> \
-        alamut.<%= domain %> \
         sucuk.<%= domain %> \
         distrib-coffee.ipsl.jussieu.fr \
         distribipsl.aero.jussieu.fr \
@@ -47,5 +46,4 @@ gid = nogroup
 [git]
     path = /git
     comment = Mageia Git repos
-    hosts allow = alamut.<%= domain %> \
-                  sucuk.<%= domain %> \
+    hosts allow = sucuk.<%= domain %>
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index b91d7365..adda4f84 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -33,8 +33,6 @@ class mga_buildsystem::config {
             'aarch64' => [ 'scwaarch641', 'scwaarch643', 'scwaarch645', 'scwaarch642', 'scwaarch644', 'scwaarch646' ],
         },
         build_nodes_aliases => {
-            'jonund0' => "jonund.${::domain}",
-            'jonund1' => "jonund.${::domain}",
             'ecosse0' => "ecosse.${::domain}",
             'ecosse1' => "ecosse.${::domain}",
             'rabbit0' => "rabbit.${::domain}",
@@ -152,14 +150,10 @@ class mga_buildsystem::config {
         '_real_vendor' => 'mageia',
     }
     $repo_allow_from_ips = [
-        $::nodes_ipaddr[valstar][ipv6],
-        $::nodes_ipaddr[valstar][ipv4],
         $::nodes_ipaddr[duvel][ipv6],
         $::nodes_ipaddr[duvel][ipv4],
         $::nodes_ipaddr[ecosse][ipv6],
         $::nodes_ipaddr[ecosse][ipv4],
-        $::nodes_ipaddr[jonund][ipv6],
-        $::nodes_ipaddr[jonund][ipv4],
         $::nodes_ipaddr[fiona][ipv6],
         $::nodes_ipaddr[fiona][ipv4],
         '10.42.0',