drop obsolete alamut, jonund, valstar stuff

14 files changed, 5 insertions, 141 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',
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp
deleted file mode 100644
index 34285b3e..00000000
--- a/manifests/nodes/alamut.pp
+++ /dev/null
@@ -1,66 +0,0 @@
-# web apps
-node alamut {
-# Location: IELO datacenter (marseille)
-#
-# TODO:
-# - Review board
-# - api
-# - pastebin
-# - LDAP slave
-#
-    include common::default_mageia_server_no_smtp
-    include postgresql::server
-    postgresql::tagged { 'old': }
-
-    timezone::timezone { 'Europe/Paris': }
-
-    include dns::server
-
-    class {'epoll::var':
-        db_password => extlookup('epoll_pgsql','x'),
-    }
-    include epoll
-    include epoll::create_db
-
-    include postfix::server::primary
-
-    # temporary, just the time the vm is running there
-    host { 'friteuse':
-        ensure       => 'present',
-        ip           => '192.168.122.131',
-        host_aliases => [ "friteuse.${::domain}", "forums.${::domain}" ],
-    }
-
-    # to create all phpbb database on alamut
-    phpbb::databases { $fqdn: }
-
-    apache::vhost::redirect_ssl { "forums.${::domain}": }
-    apache::vhost_redirect { "forum.${::domain}":
-        url => "https://forums.${::domain}/",
-    }
-    apache::vhost_redirect { "ssl_forum.${::domain}":
-        url     => "https://forums.${::domain}/",
-        vhost   => "forum.${::domain}",
-        use_ssl => true,
-    }
-
-    # connect to ssl so the proxy do not shoke if trying to
-    # enforce ssl ( note that this has not been tested, maybe this
-    # is uneeded )
-    apache::vhost::reverse_proxy { "ssl_forums.${::domain}":
-        url     => "https://forums.${::domain}/",
-        vhost   => "forums.${::domain}",
-        use_ssl => true,
-        content => '
-        RewriteEngine On
-        RewriteCond %{QUERY_STRING} mode=register
-        RewriteRule .*ucp.php - [forbidden]
-        ',
-    }
-
-    include tld_redirections
-
-    include libvirtd::kvm
-
-    include wikis
-}
diff --git a/manifests/nodes/jonund.pp b/manifests/nodes/jonund.pp
deleted file mode 100644
index 6a17c9d3..00000000
--- a/manifests/nodes/jonund.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# buildnode
-node jonund {
-# Location: IELO datacenter (marseille)
-#
-    include common::default_mageia_server
-    include mga_buildsystem::buildnode
-    timezone::timezone { 'Europe/Paris': }
-#    include shorewall
-#    include shorewall::default_firewall
-}
diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp
index 7cec9aa0..7cec9aa0 100755..100644
--- a/manifests/nodes/sucuk.pp
+++ b/manifests/nodes/sucuk.pp
diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp
deleted file mode 100644
index 7539ebbf..00000000
--- a/manifests/nodes/valstar.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-node valstar {
-# Location: IELO datacenter (marseille)
-#
-    include common::default_mageia_server
-    include mga_buildsystem::buildnode
-    timezone::timezone { 'Europe/Paris': }
-}
diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp
index c3d85fa0..5024875e 100644
--- a/manifests/nodes_ip.pp
+++ b/manifests/nodes_ip.pp
@@ -5,22 +5,10 @@ $nodes_ipaddr = {
     ipv4 => '163.172.148.228',
     ipv6 => '2001:bc8:4400:2800::4115',
   },
-  alamut => {
-    ipv4 => '212.85.158.146',
-    ipv6 => '2a02:2178:2:7::2',
-  },
-  valstar => {
-    ipv4 => '212.85.158.147',
-    ipv6 => '2a02:2178:2:7::3',
-  },
   ecosse => {
     ipv4 => '212.85.158.148',
     ipv6 => '2a02:2178:2:7::4',
   },
-  jonund => {
-    ipv4 => '212.85.158.149',
-    ipv6 => '2a02:2178:2:7::5',
-  },
   fiona => {
     ipv4 => '212.85.158.150',
     ipv6 => '2a02:2178:2:7::6',
diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf
index fa280d58..e0c116a7 100644
--- a/modules/postfix/templates/simple_relay_main.cf
+++ b/modules/postfix/templates/simple_relay_main.cf
@@ -46,8 +46,6 @@ virtual_alias_maps = regexp:/etc/postfix/sympa_aliases
 recipient_delimiter = +
 # This is ugly for a simple relay but we need ml.mageia.org to accept email :(
 inet_interfaces = all
-# Another hack to only have sucuk use it, it seems alamut allows it for relay but not other machines
-relayhost = alamut.<%= domain %>
 <%- else -%>
 inet_interfaces = localhost
 <%- end -%>
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index 9295368c..173b1cb7 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -33,15 +33,12 @@ page visible Visible Services
 page servers Servers
 group-compress Marseille
 212.85.158.151  sucuk.<%= domain %>     # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %> http://xymon.<%= domain %>
-#212.85.158.147	valstar.<%= domain %>	# testip ssh
 212.85.158.148	ecosse.<%= domain %>	# testip ssh
-#212.85.158.149	jonund.<%= domain %>	# testip ssh
 212.85.158.150	fiona.<%= domain %>	# testip ssh
 212.85.158.152	rabbit.<%= domain %>	# testip ssh
 212.85.158.153	duvel.<%= domain %>	# testip ssh rsync svn git ldapssl ldap
-#212.85.158.146 alamut.mageia.org       # testip ssh
 
-group-compress VM Alamut
+group-compress VM Sucuk
 192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=192.168.122.131/  https://forums.<%= domain %>=192.168.122.131/
 
 group-compress Scaleway
diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg
index 20ba08c4..10906fe8 100644
--- a/modules/xymon/templates/hobbit-alerts.cfg
+++ b/modules/xymon/templates/hobbit-alerts.cfg
@@ -118,7 +118,7 @@
 #                    N is the DOWNSECS value.
 
 <%
-builder = ['jonund','ecosse','rabbit','sucuk']
+builder = ['ecosse','rabbit']
 builders = builder.map{|x| x + "." + domain }.join(',')
 %>
 HOST=<%= builders %> SERVICE=cpu
diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg
index d0c33034..876cd802 100644
--- a/modules/xymon/templates/hobbit-clients.cfg
+++ b/modules/xymon/templates/hobbit-clients.cfg
@@ -349,11 +349,6 @@
 HOST=rabbit.<%= domain %>
 	DISK    %.*stage2$ IGNORE
  
-# jonund has 24 cores and we try and utilise it as much as possible
-# la of up to 1.5*cores is probably not problematic
-HOST=jonund.<%= domain %>
-	LOAD	36.0 48.0
-
 # ecosse has 24 cores, is a builder, and we try to use them all
 HOST=ecosse.<%= domain %>
     LOAD    36.0 48.0
@@ -362,10 +357,6 @@ HOST=ecosse.<%= domain %>
 HOST=rabbit.<%= domain %>
 	LOAD	18.0	24.0
 
-# sucuk has 12 cores and autobuilder uses all of them
-HOST=sucuk.<%= domain %>
-	LOAD	18.0	24.0
-
 # duvel has 24 cores, dont trigger alarms too soon
 HOST=duvel.<%= domain %>
 	LOAD	18.0	24.0