Commit 559a20a4 authored by Stefane Fermigier's avatar Stefane Fermigier

fix: deal with openssl.

parent 887576b8
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
# not need these here). # not need these here).
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = fc7afd5c35a756de1f020a089d82e3d9 md5sum = 8c56b370d0344e6d325818827447c3be
...@@ -39,6 +39,7 @@ log = ${:var}/log ...@@ -39,6 +39,7 @@ log = ${:var}/log
plugins = ${:etc}/plugins plugins = ${:etc}/plugins
ssl = ${:etc}/ssl ssl = ${:etc}/ssl
[mynij-proxy-service] [mynij-proxy-service]
# Actual script that starts the service: # Actual script that starts the service:
# This recipe will try to "exec" the command-line after separating parameters. # This recipe will try to "exec" the command-line after separating parameters.
...@@ -72,7 +73,7 @@ url = https://[${mynij-proxy-service:host}]:${mynij-proxy-service:port} ...@@ -72,7 +73,7 @@ url = https://[${mynij-proxy-service:host}]:${mynij-proxy-service:port}
[certificates] [certificates]
recipe = plone.recipe.command recipe = plone.recipe.command
command = "{{ parameter_dict['openssl'] }}" req -newkey rsa -batch -new -x509 -days 3650 -nodes -keyout "${:ssl_key}" -out "${:ssl_crt}" command = "{{ openssl_bin }}" req -newkey rsa -batch -new -x509 -days 3650 -nodes -keyout "${:ssl_key}" -out "${:ssl_crt}"
stop-on-error = true stop-on-error = true
ssl_crt = ${directory:ssl}/httpd.crt ssl_crt = ${directory:ssl}/httpd.crt
ssl_key = ${directory:ssl}/httpd.key ssl_key = ${directory:ssl}/httpd.key
...@@ -8,6 +8,7 @@ extends = ...@@ -8,6 +8,7 @@ extends =
# "slapos" stack describes basic things needed for 99.9% of SlapOS Software # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
# Releases # Releases
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/openssl/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
# Extend here component profiles, like openssl, apache, mariadb, curl... # Extend here component profiles, like openssl, apache, mariadb, curl...
...@@ -77,6 +78,7 @@ context = ...@@ -77,6 +78,7 @@ context =
key mynij_proxy_location mynij-proxy-repository:location key mynij_proxy_location mynij-proxy-repository:location
raw gunicorn_bin ${buildout:bin-directory}/gunicorn raw gunicorn_bin ${buildout:bin-directory}/gunicorn
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
raw openssl_bin ${openssl:location}/bin/openssl
[versions] [versions]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment