diff options
| -rwxr-xr-x | manifests/nodes/alamut.pp | 14 | ||||
| -rwxr-xr-x | manifests/nodes/sucuk.pp | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp index 53380da2..dd8e2a32 100755 --- a/manifests/nodes/alamut.pp +++ b/manifests/nodes/alamut.pp @@ -72,20 +72,6 @@ node alamut { include wikis - class { 'mgapeople': - ldap_server => "ldap.${::domain}", - binddn => 'cn=mgapeople-alamut,ou=System Accounts,dc=mageia,dc=org', - bindpw => extlookup('mgapeople_ldap','x'), - vhost => "people.${::domain}", - vhostdir => "/var/www/vhosts/people.${::domain}", - maintdburl => "http://pkgsubmit.${::domain}/data/maintdb.txt", - } - - class { 'mga-treasurer': - 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.${::domain}", diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp index 331f755e..4236b648 100755 --- a/manifests/nodes/sucuk.pp +++ b/manifests/nodes/sucuk.pp @@ -33,6 +33,21 @@ node sucuk { # apache::vhost_simple { "xymon.${::domain}": # location => '/var/lib/xymon/www', # } + + class { 'mgapeople': + ldap_server => "ldap.${::domain}", + binddn => 'cn=mgapeople-alamut,ou=System Accounts,dc=mageia,dc=org', + bindpw => extlookup('mgapeople_ldap','x'), + vhost => "people.${::domain}", + vhostdir => "/var/www/vhosts/people.${::domain}", + maintdburl => "http://pkgsubmit.${::domain}/data/maintdb.txt", + } + + class { 'mga-treasurer': + vhost => "treasurer.${::domain}", + vhostdir => "/var/www/vhosts/treasurer.${::domain}", + } + youri-check::report_www { 'check': } youri-check::config {'config_cauldron': |