diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/defaults.pp | 6 | ||||
| -rw-r--r-- | manifests/nodes/duvel.pp | 2 | ||||
| -rw-r--r-- | manifests/nodes/friteuse.pp | 2 | ||||
| -rw-r--r-- | manifests/nodes/ncaa1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/neru.pp | 10 | ||||
| -rw-r--r-- | manifests/nodes/ociaa1.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes/rabbit.pp | 4 | ||||
| -rw-r--r-- | manifests/nodes/sucuk.pp | 1 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 4 |
9 files changed, 35 insertions, 8 deletions
diff --git a/manifests/defaults.pp b/manifests/defaults.pp index 762cd146..85f3f31c 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -30,8 +30,6 @@ Service { ensure => running, } -if versioncmp($::lsbdistrelease, '2') >= 0 { - Service { - provider => systemd, - } +Service { + provider => systemd, } diff --git a/manifests/nodes/duvel.pp b/manifests/nodes/duvel.pp index 70bbb242..772e43dc 100644 --- a/manifests/nodes/duvel.pp +++ b/manifests/nodes/duvel.pp @@ -13,7 +13,7 @@ node duvel { include subversion::client include subversion::server include puppet::master - include reports::ii + #include reports::ii include sshkeys::keymaster include mga_buildsystem::mainnode diff --git a/manifests/nodes/friteuse.pp b/manifests/nodes/friteuse.pp index 9c0fdde1..b096021e 100644 --- a/manifests/nodes/friteuse.pp +++ b/manifests/nodes/friteuse.pp @@ -1,5 +1,5 @@ node friteuse { -# Location: VM hosted by nfrance (toulouse) +# Location: VM hosted on sucuk # include common::default_mageia_server timezone::timezone { 'Europe/Paris': } diff --git a/manifests/nodes/ncaa1.pp b/manifests/nodes/ncaa1.pp new file mode 100644 index 00000000..b512939a --- /dev/null +++ b/manifests/nodes/ncaa1.pp @@ -0,0 +1,7 @@ +node ncaa1 { +# Location: Netcup, Vienna +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/neru.pp b/manifests/nodes/neru.pp index 8af61124..66958059 100644 --- a/manifests/nodes/neru.pp +++ b/manifests/nodes/neru.pp @@ -24,6 +24,16 @@ node neru { include access_classes::web include openssh::ssh_keys_from_ldap + # temporary redirects for madb (2024-11) until it gets hosted on Mageia infra + apache::vhost_redirect { "madb.${::domain}": + url => "https://madb.mageialinux-online.org/", + } + apache::vhost_redirect { "ssl_madb.${::domain}": + use_ssl => true, + vhost => "madb.${::domain}", + url => "https://madb.mageialinux-online.org/", + } + openldap::slave_instance { '1': rid => 1, } diff --git a/manifests/nodes/ociaa1.pp b/manifests/nodes/ociaa1.pp new file mode 100644 index 00000000..ce476665 --- /dev/null +++ b/manifests/nodes/ociaa1.pp @@ -0,0 +1,7 @@ +node ociaa1 { +# Location: ? +# + include common::default_mageia_server + include mga_buildsystem::buildnode + timezone::timezone { 'Europe/Paris': } +} diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp index ae4d4b08..2436219b 100644 --- a/manifests/nodes/rabbit.pp +++ b/manifests/nodes/rabbit.pp @@ -21,8 +21,8 @@ node rabbit { } youri-check::check {'check_cauldron': version => 'cauldron', - hour => '*/2', - minute => 10 + hour => '1-23/2', + minute => 30 } # for testing iso quickly diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp index c13d11cf..e56fd113 100644 --- a/manifests/nodes/sucuk.pp +++ b/manifests/nodes/sucuk.pp @@ -4,6 +4,7 @@ node sucuk { include common::default_mageia_server_no_smtp timezone::timezone { 'Europe/Paris': } + include openssh::ssh_keys_from_ldap include access_classes::admin include postgresql::server diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index ca395ac0..38553b61 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -60,6 +60,10 @@ $nodes_ipaddr = { }, ociaa2 => { ipv6 => '2603:c026:c101:f00::1:2', + }, + ncaa1 => { + ipv4 => '89.58.19.166', + ipv6 => '2a0a:4cc0:0:61c::1', } } |