apache-frontend: Remove stunnel from apache frontend recipe

software/apache-frontend/instance.cfg

@@ -37,6 +37,7 @@ cronstamps = $${:etc}/cronstamps
 ca-dir = $${:srv}/ssl
 
 squid-cache = $${:srv}/squid_cache
+stunnel-conf = $${:etc}/stunnel
 
 [instance-parameter]
 # Fetches parameters defined in SlapOS Master for this instance.
@@ -115,6 +116,31 @@ wrapper = $${directory:service}/apache_frontend
 # Put domain name
 name = $${instance-parameter:configuration.domain}
 
+[ca-stunnel]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = $${directory:stunnel-conf}/stunnel.key
+cert-file = $${directory:stunnel-conf}/stunnel.crt
+executable = $${stunnel:wrapper}
+wrapper = $${basedirectory:services}/stunnel
+
+[stunnel]
+recipe = slapos.cookbook:stunnel
+stunnel-binary = ${stunnel:location}/bin/stunnel
+wrapper = $${directory:bin}/stunnel
+log-file = $${directory:log}/stunnel.log
+config-file = $${directory:etc}/stunnel.conf
+key-file = $${ca-stunnel:key-file}
+cert-file = $${ca-stunnel:cert-file}
+pid-file = $${directory:run}/stunnel.pid
+local-port = $${squid-hardcoded:backend-port}
+local-host = $${squid-hardcoded:backend-ip}
+remote-host = $${squid-hardcoded:remote-host}
+remote-port = $${squid-hardcoded:remote-port}
+client = false
+post-rotate-script = $${directory:bin}/stunnel_post_rotate
+
+
 [cron]
 recipe = slapos.cookbook:cron
 dcrond-binary = ${dcron:location}/sbin/crond
@@ -183,4 +209,6 @@ ip = 10.0.24.140
 port = 26010
 backend-ip = 10.0.24.140
 backend-port = 26011
-domain = softinst34784.bateau.org
+domain = softinst34784.bateau.org
\ No newline at end of file
+remote-host = 2001:470:1f14:169:d418:9eb7:1bea:8983
+remote-port = 16001
\ No newline at end of file