diff options
| author | Thomas Backlund <tmb@mageia.org> | 2019-07-06 20:07:19 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2019-07-06 20:07:19 +0300 |
| commit | c7370364187f099a4d17be079674b7209064ad8a (patch) | |
| tree | e8e1c0d92e4e834480ddb2d43180b4afa1841de1 /manifests | |
| parent | 08625db2309fa5cd5528ccfbbeb680da9d34e858 (diff) | |
| download | puppet-c7370364187f099a4d17be079674b7209064ad8a.tar puppet-c7370364187f099a4d17be079674b7209064ad8a.tar.gz puppet-c7370364187f099a4d17be079674b7209064ad8a.tar.bz2 puppet-c7370364187f099a4d17be079674b7209064ad8a.tar.xz puppet-c7370364187f099a4d17be079674b7209064ad8a.zip | |
drop obsolete alamut, jonund, valstar stuff
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/nodes/alamut.pp | 66 | ||||
| -rw-r--r-- | manifests/nodes/jonund.pp | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | manifests/nodes/sucuk.pp | 0 | ||||
| -rw-r--r-- | manifests/nodes/valstar.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes_ip.pp | 12 |
5 files changed, 0 insertions, 95 deletions
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp deleted file mode 100644 index 34285b3e..00000000 --- a/manifests/nodes/alamut.pp +++ /dev/null @@ -1,66 +0,0 @@ -# web apps -node alamut { -# Location: IELO datacenter (marseille) -# -# TODO: -# - Review board -# - api -# - pastebin -# - LDAP slave -# - include common::default_mageia_server_no_smtp - include postgresql::server - postgresql::tagged { 'old': } - - timezone::timezone { 'Europe/Paris': } - - include dns::server - - class {'epoll::var': - db_password => extlookup('epoll_pgsql','x'), - } - include epoll - include epoll::create_db - - include postfix::server::primary - - # temporary, just the time the vm is running there - host { 'friteuse': - ensure => 'present', - ip => '192.168.122.131', - 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_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}", - use_ssl => true, - content => ' - RewriteEngine On - RewriteCond %{QUERY_STRING} mode=register - RewriteRule .*ucp.php - [forbidden] - ', - } - - include tld_redirections - - include libvirtd::kvm - - include wikis -} diff --git a/manifests/nodes/jonund.pp b/manifests/nodes/jonund.pp deleted file mode 100644 index 6a17c9d3..00000000 --- a/manifests/nodes/jonund.pp +++ /dev/null @@ -1,10 +0,0 @@ -# buildnode -node jonund { -# Location: IELO datacenter (marseille) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -# include shorewall -# include shorewall::default_firewall -} diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp index 7cec9aa0..7cec9aa0 100755..100644 --- a/manifests/nodes/sucuk.pp +++ b/manifests/nodes/sucuk.pp diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp deleted file mode 100644 index 7539ebbf..00000000 --- a/manifests/nodes/valstar.pp +++ /dev/null @@ -1,7 +0,0 @@ -node valstar { -# Location: IELO datacenter (marseille) -# - include common::default_mageia_server - include mga_buildsystem::buildnode - timezone::timezone { 'Europe/Paris': } -} diff --git a/manifests/nodes_ip.pp b/manifests/nodes_ip.pp index c3d85fa0..5024875e 100644 --- a/manifests/nodes_ip.pp +++ b/manifests/nodes_ip.pp @@ -5,22 +5,10 @@ $nodes_ipaddr = { ipv4 => '163.172.148.228', ipv6 => '2001:bc8:4400:2800::4115', }, - alamut => { - ipv4 => '212.85.158.146', - ipv6 => '2a02:2178:2:7::2', - }, - valstar => { - ipv4 => '212.85.158.147', - ipv6 => '2a02:2178:2:7::3', - }, ecosse => { ipv4 => '212.85.158.148', ipv6 => '2a02:2178:2:7::4', }, - jonund => { - ipv4 => '212.85.158.149', - ipv6 => '2a02:2178:2:7::5', - }, fiona => { ipv4 => '212.85.158.150', ipv6 => '2a02:2178:2:7::6', |