diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/main_mirror/templates/rsyncd.conf | 7 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 20 | ||||
| -rw-r--r-- | deployment/releasekey/templates/sign_checksums | 2 | ||||
| -rw-r--r-- | deployment/reports/templates/socket.yaml | 2 |
4 files changed, 7 insertions, 24 deletions
diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf index b9186083..9fc93860 100644 --- a/deployment/main_mirror/templates/rsyncd.conf +++ b/deployment/main_mirror/templates/rsyncd.conf @@ -9,8 +9,8 @@ gid = nogroup hosts allow = \ 10.42.0.0/24 \ 2a02:2178:2:7::/64 \ - rabbit.<%= domain %> \ - sucuk.<%= domain %> \ + rabbit.<%= @domain %> \ + sucuk.<%= @domain %> \ distrib-coffee.ipsl.jussieu.fr \ ftp.proxad.net \ jobbot0.ibiblio.org \ @@ -20,6 +20,7 @@ gid = nogroup poincare.acc.umu.se \ sagres.c3sl.ufpr.br \ sv.mirrors.kernel.org \ + ny.mirrors.kernel.org \ 147.75.69.246 \ 2001:14ba:a417:eb00::1 \ 2001:14ba:a417:eb00::2 @@ -27,4 +28,4 @@ gid = nogroup [git] path = /git comment = Mageia Git repos - hosts allow = sucuk.<%= domain %> + hosts allow = sucuk.<%= @domain %> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 6b7ceb2b..0f56337b 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -37,28 +37,10 @@ class mga_buildsystem::config { 'ecosse1' => "ecosse.${::domain}", 'rabbit0' => "rabbit.${::domain}", 'rabbit1' => "rabbit.${::domain}", - 'ec2aa1-a' => "ec2aa1.${::domain}", - 'ec2aa1-b' => "ec2aa1.${::domain}", - 'ec2aa2-a' => "ec2aa2.${::domain}", - 'ec2aa2-b' => "ec2aa2.${::domain}", - 'ec2aa3-a' => "ec2aa3.${::domain}", - 'ec2aa3-b' => "ec2aa3.${::domain}", - 'ec2x1-a' => "ec2x1.${::domain}", - 'ec2x1-b' => "ec2x1.${::domain}", - 'ec2x2-a' => "ec2x2.${::domain}", - 'ec2x2-b' => "ec2x2.${::domain}", - 'pktaa1-a' => "pktaa1.${::domain}", - 'pktaa1-b' => "pktaa1.${::domain}", - 'pktaa1-c' => "pktaa1.${::domain}", - 'pktaa1-d' => "pktaa1.${::domain}", - 'pktaa1-e' => "pktaa1.${::domain}", - 'pktaa1-f' => "pktaa1.${::domain}", + 'rabbit2' => "rabbit.${::domain}", 'ociaa1-a' => "ociaa1.${::domain}", 'ociaa1-b' => "ociaa1.${::domain}", 'ociaa1-c' => "ociaa1.${::domain}", - 'ociaa2-a' => "ociaa2.${::domain}", - 'ociaa2-b' => "ociaa2.${::domain}", - 'ociaa2-c' => "ociaa2.${::domain}", }, build_src_node => 'duvel', } diff --git a/deployment/releasekey/templates/sign_checksums b/deployment/releasekey/templates/sign_checksums index 9483a1c9..5edf7e57 100644 --- a/deployment/releasekey/templates/sign_checksums +++ b/deployment/releasekey/templates/sign_checksums @@ -7,5 +7,5 @@ fi directory=$1 cd "$directory" for chksum in *.md5 *.sha3 *.sha512; do - gpg --homedir "<%= sign_keydir %>" --yes --sign "$chksum" + gpg --homedir "<%= @sign_keydir %>" --yes --sign "$chksum" done diff --git a/deployment/reports/templates/socket.yaml b/deployment/reports/templates/socket.yaml index 075d7a9f..6b0a8b33 100644 --- a/deployment/reports/templates/socket.yaml +++ b/deployment/reports/templates/socket.yaml @@ -1,2 +1,2 @@ --- -socket_path: /var/lib/ii/<%= nick %>/<%= server %>/<%= channel %>/in +socket_path: /var/lib/ii/<%= @nick %>/<%= @server %>/<%= @channel %>/in |