diff options
author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
---|---|---|
committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
commit | c61daf65b58b943994d1f21e52deee9a9ce04827 (patch) | |
tree | ffeb83234cb01580abe04217f8b8eca9698d5424 /manifests/nodes | |
parent | c4cb8478752701a83c4e3b4b73d661e188d67daa (diff) | |
download | puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.gz puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.bz2 puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.xz puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.zip |
use consistent domain references
Diffstat (limited to 'manifests/nodes')
-rw-r--r-- | manifests/nodes/alamut.pp | 38 | ||||
-rw-r--r-- | manifests/nodes/valstar.pp | 6 |
2 files changed, 22 insertions, 22 deletions
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp index 1f4c469c..f62829f2 100644 --- a/manifests/nodes/alamut.pp +++ b/manifests/nodes/alamut.pp @@ -31,28 +31,28 @@ node alamut { host { 'friteuse': ensure => 'present', ip => '192.168.122.131', - host_aliases => [ "friteuse.$domain", "forums.$domain" ], + host_aliases => [ "friteuse.${::domain}", "forums.${::domain}" ], } # to create all phpbb database on alamut phpbb::databases { $fqdn: } - apache::vhost::redirect_ssl { "forums.$domain": } - apache::vhost_redirect { "forum.$domain": - url => "https://forums.$domain/", + apache::vhost::redirect_ssl { "forums.${::domain}": } + apache::vhost_redirect { "forum.${::domain}": + url => "https://forums.${::domain}/", } - apache::vhost_redirect { "ssl_forum.$domain": - url => "https://forums.$domain/", - vhost => "forum.$domain", + apache::vhost_redirect { "ssl_forum.${::domain}": + url => "https://forums.${::domain}/", + vhost => "forum.${::domain}", use_ssl => true, } # connect to ssl so the proxy do not shoke if trying to # enforce ssl ( note that this has not been tested, maybe this # is uneeded ) - apache::vhost::reverse_proxy { "ssl_forums.$domain": - url => "https://forums.$domain/", - vhost => "forums.$domain", + apache::vhost::reverse_proxy { "ssl_forums.${::domain}": + url => "https://forums.${::domain}/", + vhost => "forums.${::domain}", use_ssl => true, content => ' RewriteEngine On @@ -76,7 +76,7 @@ node alamut { include gitmirror include xymon::server - apache::vhost_simple { "xymon.$domain": + apache::vhost_simple { "xymon.${::domain}": location => '/var/lib/xymon/www', } @@ -106,28 +106,28 @@ node alamut { include websites::nav class { 'mgapeople': - ldap_server => 'ldap.mageia.org', + ldap_server => "ldap.${::domain}", binddn => 'cn=mgapeople-alamut,ou=System Accounts,dc=mageia,dc=org', bindpw => extlookup('mgapeople_ldap','x'), - vhost => 'people.mageia.org', - vhostdir => '/var/www/vhosts/people.mageia.org', - maintdburl => 'http://pkgsubmit.mageia.org/data/maintdb.txt', + vhost => "people.${::domain}", + vhostdir => "/var/www/vhosts/people.${::domain}", + maintdburl => "http://pkgsubmit.${::domain}/data/maintdb.txt", } class { 'mga-treasurer': - vhost => 'treasurer.mageia.org', - vhostdir => '/var/www/vhosts/treasurer.mageia.org', + vhost => "treasurer.${::domain}", + vhostdir => "/var/www/vhosts/treasurer.${::domain}", } # Forward ports to arm1 and arm2 ssh, to access them from outside xinetd::port_forward {'forward_arm1': - target_ip => 'arm1.mageia.org', + target_ip => "arm1.${::domain}", target_port => '22', port => '4251', proto => 'tcp', } xinetd::port_forward {'forward_arm2': - target_ip => 'arm2.mageia.org', + target_ip => "arm2.${::domain}", target_port => '22', port => '4252', proto => 'tcp', diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp index 2f305220..a96a0f9f 100644 --- a/manifests/nodes/valstar.pp +++ b/manifests/nodes/valstar.pp @@ -36,11 +36,11 @@ node valstar { include websites::git class { 'mga-advisories': - vhost => 'advisories.mageia.org', + vhost => "advisories.${::domain}", } git::snapshot { '/etc/puppet': - source => 'git://git.mageia.org/infrastructure/puppet/' + source => "git://git.${::domain}/infrastructure/puppet/" } mirror_cleaner::orphans { 'cauldron': @@ -48,7 +48,7 @@ node valstar { } class { 'mgagit': - ldap_server => 'ldap.mageia.org', + ldap_server => "ldap.${::domain}", binddn => 'cn=mgagit-valstar,ou=System Accounts,dc=mageia,dc=org', bindpw => extlookup('mgagit_ldap','x'), } |