diff options
-rw-r--r-- | deployment/dns/templates/mageia.org.zone | 2 | ||||
-rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 1 | ||||
-rw-r--r-- | manifests/nodes/armagnac.pp | 7 | ||||
-rw-r--r-- | manifests/nodes_ip.pp | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index a9e6762f..e653b7e9 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. ( - 2015102900 ; Serial + 2015120300 ; Serial 21600 ; Refresh 3600 ; Retry 2419200 ; Expire diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 5f8fbdcb..80e9414f 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -158,6 +158,7 @@ class mga_buildsystem::config { $::nodes_ipaddr[sucuk][ipv6], '85.134.55.73', $::nodes_ipaddr[armorique][ipv4], + $::nodes_ipaddr[armagnac][ipv4], ] # the list of checks, actions, posts for cauldron in youri-upload diff --git a/manifests/nodes/armagnac.pp b/manifests/nodes/armagnac.pp new file mode 100644 index 00000000..2dc82f0d --- /dev/null +++ b/manifests/nodes/armagnac.pp @@ -0,0 +1,7 @@ +node armagnac { +# Location: Scaleway (Iliad/Online datacenter) + include common::default_mageia_server + timezone::timezone { 'Europe/Paris': } + + include mga_buildsystem::buildnode +} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index 780afe15..28b5c5d9 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -43,6 +43,9 @@ $nodes_ipaddr = { arm2 => { ipv4 => '10.42.0.52', }, + armagnac => { + ipv4 => '212.47.231.90', + }, armorique => { ipv4 => '212.47.242.112', }, |