diff options
author | Leif Johansson <leifj@sunet.se> | 2015-03-06 09:54:58 +0100 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-03-06 09:54:58 +0100 |
commit | af35d867c45dc5ac1d0b2cefe8f8c6caec41eb67 (patch) | |
tree | d9e9b37a8731791358fcb2a26aff7d561e0d5f87 | |
parent | 285a421e98d311f8b9488ce529b1613de4d4e5cd (diff) |
cleanup unused modulessunet-ops-2015-03-06-v03
-rw-r--r-- | global/overlay/etc/puppet/cosmos-modules.conf | 3 | ||||
-rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 37 |
2 files changed, 1 insertions, 39 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf index 80c0216..911ebc1 100644 --- a/global/overlay/etc/puppet/cosmos-modules.conf +++ b/global/overlay/etc/puppet/cosmos-modules.conf @@ -12,9 +12,8 @@ hiera-gpg git://github.com/SUNET/hiera-gpg.git no sunet-* pound git://github.com/SUNET/puppet-pound.git yes sunet-* augeas git://github.com/SUNET/puppet-augeas.git yes sunet-* bastion git://github.com/SUNET/puppet-bastion.git yes sunet-* -apache puppetlabs/apache no pyff git://github.com/samlbits/puppet-pyff.git yes puppet-pyff-* -postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-* +#postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-* dhcp git://github.com/SUNET/puppetlabs-dhcp.git yes sunet-* varnish git://github.com/samlbits/puppet-varnish.git yes puppet-varnish-* docker git://github.com/SUNET/garethr-docker.git yes sunet-* diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 218f69b..e512149 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -658,43 +658,6 @@ class swamidops { } } -node 'wp.sunet.se' { - package {'libapache2-mod-php5': ensure => 'latest'} - package {'php5-mysql': ensure => 'latest'} - class {'apache': - mpm_module => 'prefork', - default_vhost => false - } - apache::mod {'php5': } - apache::mod {'ssl': } - apache::mod {'rewrite': } - apache::vhost { 'wp.sunet.se': - port => 80, - docroot => '/opt/wordpress' - } - include mysql::server - user {'wordpress': ensure => present, groups => 'www-data'} - class { 'wordpress': - wp_owner => 'wordpress', - wp_group => 'www-data', - db_user => 'wp', - db_password => hiera('mysql_password', 'NOT_SET_IN_HIERA'), - wp_multisite => false, - wp_site_domain => 'wp.sunet.se', - version => '3.8.1' - } - ufw::allow { 'allow-www-wordpress': - port => '80', - ip => 'any', # both IPv4 and IPv6 - proto => 'tcp' - } - ufw::allow { 'allow-https-wordpress': - port => '443', - ip => 'any', # both IPv4 and IPv6 - proto => 'tcp' - } -} - node 'cdr1.sunet.se' { package {'python-vm-builder': |