diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/docker-compose.yml b/global/overlay/etc/puppet/modules/net/files/cisoassistant/docker-compose.yml index 8355c27..9c78ea7 100644 --- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/docker-compose.yml +++ b/global/overlay/etc/puppet/modules/net/files/cisoassistant/docker-compose.yml @@ -1,4 +1,13 @@ services: + always-https: + container_name: always-https + image: docker.sunet.se/always-https + restart: always + ports: + - 80:80 + environment: + - ACME_URL=http://acme-c.sunet.se/ + backend: container_name: backend image: ghcr.io/intuitem/ciso-assistant-enterprise-backend:latest diff --git a/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp b/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp index ac50f7e..7f6e546 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp @@ -24,11 +24,6 @@ class net::cisoassistant { * => $params, } } - sunet::docker_compose { 'always-https': - image => 'docker.sunet.se/always-https', - service_name => 'acme_http' - env => ['ACME_URL=http://acme-c.sunet.se/'], - } file { '/etc/docker/daemon.json': mode => '0744', owner => 'root',