diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 2 | ||||
| -rw-r--r-- | manifests/nodes/neru.pp | 35 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 4 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 1 |
4 files changed, 42 insertions, 0 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 675a3ab9..ba1cff2c 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -166,6 +166,8 @@ class mga_buildsystem::config { $::nodes_ipaddr[armorique][ipv4], $::nodes_ipaddr[armagnac][ipv4], $::nodes_ipaddr[armrest][ipv4], + $::nodes_ipaddr[neru][ipv4], + $::nodes_ipaddr[neru][ipv6], ] $repo_allow_from_domains = [ ".${::domain}", diff --git a/manifests/nodes/neru.pp b/manifests/nodes/neru.pp new file mode 100644 index 00000000..9bb69a9b --- /dev/null +++ b/manifests/nodes/neru.pp @@ -0,0 +1,35 @@ +node neru { +# Location: Scaleway Paris +# + include common::default_mageia_server + timezone::timezone { 'Europe/Paris': } + include postfix::server::secondary +# include blog::base +# include blog::db_backup +# include blog::files_bots +# include blog::files_backup +# include mysql::server + include dns::server + + include planet + include websites::archives + include websites::static + include websites::hugs + include websites::releases + include websites::www + include websites::nav + include websites::doc + include websites::start + include dashboard + include access_classes::web + include openssh::ssh_keys_from_ldap + + openldap::slave_instance { '1': + rid => 1, + } + + # http server for meetbot logs +# include apache::base +} +# Other services running on this server : +# - meetbot diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 8e5e4773..6bf4521c 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -9,6 +9,10 @@ $nodes_ipaddr = { ipv4 => '217.70.188.116', ipv6 => '2001:4b98:dc0:41:216:3eff:fe4f:5a18', }, + neru => { + ipv4 => '163.172.148.228', + ipv6 => '2001:bc8:4400:2800::4115', + } alamut => { ipv4 => '212.85.158.146', ipv6 => '2a02:2178:2:7::2', diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index eaab31db..96cb6881 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -52,3 +52,4 @@ group-compress Scaleway 212.47.231.90 armagnac.<%= domain %> # testip ssh 212.47.242.112 armorique.<%= domain %> # testip ssh 163.172.153.185 armrest.<%= domain %> # testip ssh +163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp |