aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorBruno Cornec <bruno@victoria.frmug.org>2024-12-06 00:35:12 +0100
committerBruno Cornec <bruno@victoria.frmug.org>2026-02-10 12:27:10 +0100
commita55d46021567b606594c97b265fd8cb173d625d0 (patch)
tree8b9023aac7dfac73c707586ec894eee514409fea /modules
parentcd8cadb42965e34faa9fae5fa8e16ed4ed7abc2d (diff)
downloadpuppet-user/bcornec/infra.tar
puppet-user/bcornec/infra.tar.gz
puppet-user/bcornec/infra.tar.bz2
puppet-user/bcornec/infra.tar.xz
puppet-user/bcornec/infra.zip
Add new serversuser/bcornec/infra
- 2 new aarch64 build nodes named lavand and majax - 2 new build nodes named houdini and garcimore - a deploy server named mandrake - a web server named webb - a repo server named melies - update DNS and monitoring - prepare to integrate the new build nodes Preparation for 2 new x86_64 build nodes Adds pp file for majax IPs added for garcimore and houdini update DNS
Diffstat (limited to 'modules')
-rw-r--r--modules/postfix/manifests/server/primary.pp2
-rw-r--r--modules/xymon/templates/bb-hosts10
2 files changed, 10 insertions, 2 deletions
diff --git a/modules/postfix/manifests/server/primary.pp b/modules/postfix/manifests/server/primary.pp
index c14a8606..00e2df1e 100644
--- a/modules/postfix/manifests/server/primary.pp
+++ b/modules/postfix/manifests/server/primary.pp
@@ -2,7 +2,7 @@ class postfix::server::primary inherits postfix::server {
# Adding DKIM server
include opendkim
- opendkim::domain{['mageia.org', 'sucuk.mageia.org', 'duvel.mageia.org', 'forums.mageia.org', 'madb.mageia.org','rabbit.mageia.org', 'fiona.mageia.org','identity.mageia.org', 'group.mageia.org', 'neru.mageia.org']:}
+ opendkim::domain{['mageia.org', 'sucuk.mageia.org', 'duvel.mageia.org', 'forums.mageia.org', 'madb.mageia.org','rabbit.mageia.org', 'garcimore.mageia.org', 'webb.mageia.org', 'melies.mageia.org', 'mandrake.mageia.org', 'houdini.mageia.org','identity.mageia.org', 'group.mageia.org', 'neru.mageia.org']:}
opendkim::trusted{['127.0.0.0/8', '212.85.158.0/24']:}
package { ['postfix-ldap', 'sqlite3-tools', 'dovecot-plugins-sqlite','rspamd']: }
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index 140932b5..baf84118 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -36,13 +36,21 @@ 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.148 ecosse.<%= 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.154 garcimore.<%= domain %> # testip ssh
+212.85.158.155 houdini.<%= domain %> # testip ssh
+212.85.158.156 mandrake.<%= domain %> # testip ssh
+212.85.158.157 webb.<%= domain %> # testip ssh
+212.85.158.158 melies.<%= domain %> # testip ssh
group-compress VM Sucuk
192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/
+group-compress Hetzner
+49.13.82.246 lavand.<%= domain %> # testip
+128.140.83.19 majax.<%= domain %> # testip
+
group-compress Scaleway
163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp
163.172.201.211 madb.mageia.org # testip