use new apache-based https redirectersunet-ops-2015-08-19-v01

1 files changed, 8 insertions, 3 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index bd5439b..9443920 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -832,11 +832,11 @@ class webfrontend {
    class { 'sunet::vrrphttp': }
    sunet::docker_run{"pound":
       image    => "docker.sunet.se/pound",
-      imagetag => "redirect",
+      imagetag => "latest",
       volumes  => ["/etc/ssl:/etc/ssl"],
       env      => ["BACKEND_PORT=tcp://varnish.docker:80"],
-      ports    => ["443:443","80:80"],
-      start_on => "docker_varnish"
+      ports    => ["443:443"],
+      start_on => "docker-varnish"
    }
    sunet::etcd_node {'sunetweb':
       disco_url => 'https://discovery.etcd.io/877f25988ea1e8bb8c9a49f2ad5f5f6a',
@@ -847,6 +847,11 @@ class webfrontend {
       imagetag => "latest",
       env      => ["ETCD_URL=http://etcd_sunetweb.docker:4001"],
    }
+   sunet::docker_run{"always-https":
+      image    => "docker.sunet.se/always-https",
+      ports    => ["80:80"],
+      starts_on => "docker-pound"
+   }
 }
 
 class webappserver {