diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-05-25 14:21:18 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-05-25 14:21:18 +0200 |
| commit | 14916d742d511e154cec78f032dd354de22e4710 (patch) | |
| tree | 734835c83a908b89f15ccefcf02643137a4363b3 /global/overlay/etc/puppet | |
| parent | 4730631dbcc478b2785b9f5fa7c0b258dbbce4c4 (diff) | |
latest now contains x-forwarded-protosunet-ops-2015-05-25-v02
Diffstat (limited to 'global/overlay/etc/puppet')
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-modules.conf | 8 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf index eafef6f..0260724 100644 --- a/global/overlay/etc/puppet/cosmos-modules.conf +++ b/global/overlay/etc/puppet/cosmos-modules.conf @@ -4,11 +4,11 @@ concat git://github.com/SUNET/puppetlabs-concat.git yes sunet-* stdlib git://github.com/SUNET/puppetlabs-stdlib.git yes sunet-* cosmos git://github.com/SUNET/puppet-cosmos.git yes sunet-* ufw git://github.com/SUNET/puppet-module-ufw.git yes sunet-* -apt git://github.com/SUNET/puppetlabs-apt.git no sunet-* -vcsrepo git://github.com/SUNET/puppetlabs-vcsrepo.git no sunet-* -xinetd git://github.com/SUNET/puppetlabs-xinetd.git no sunet-* +apt git://github.com/SUNET/puppetlabs-apt.git yes sunet-* +vcsrepo git://github.com/SUNET/puppetlabs-vcsrepo.git yes sunet-* +xinetd git://github.com/SUNET/puppetlabs-xinetd.git yes sunet-* python git://github.com/SUNET/puppet-python.git yes sunet-* -hiera-gpg git://github.com/SUNET/hiera-gpg.git no sunet-* +hiera-gpg git://github.com/SUNET/hiera-gpg.git yes 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-* diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index d054c4d..678f11b 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -785,7 +785,7 @@ class webfrontend { class { 'webcommon': } sunet::docker_run{"pound": image => "docker.sunet.se/pound", - imagetag => "xfp", + imagetag => "latest", volumes => ["/etc/ssl:/etc/ssl"], env => ["BACKEND_PORT=tcp://varnish.docker:80"], ports => ["443:443"] |