wip

software/simpleran/buildout.hash.cfg

@@ -36,7 +36,7 @@ md5sum = 93a5e07a763b619747255b4e03b50bbe
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = e5b3534bbadc8ed5355d389194ddfb62
+md5sum = cfd83f4dfd57a02ee2a3950cb4cc01cd
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 2b8d54e9189477494d8be2df820b2f3f
+md5sum = b116b58365600f12129d458750b57c71
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg

software/simpleran/instance-enb.jinja2.cfg

@@ -82,8 +82,6 @@ ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
 recipe = slapos.cookbook:mkdirectory
 software = {{ buildout_directory }}
 home = ${buildout:directory}
-ca-dir = ${:srv}/ssl
-websocket-conf = ${:etc}/websocket
 var = ${:home}/var
 etc = ${:home}/etc
 bin = ${:home}/bin

software/simpleran/ru/libinstance.jinja2.cfg

@@ -430,7 +430,7 @@ inline =
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = {{ openssl_executable_location }}
-ca-dir = ${directory:ca-dir}
+ca-dir = ${directory:srv}
 requests-directory = ${cadirectory:requests}
 wrapper = ${directory:bin}/certificate_authority
 ca-private = ${cadirectory:private}
@@ -446,17 +446,17 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = ${directory:ca-dir}/requests/
-private = ${directory:ca-dir}/private/
-certs = ${directory:ca-dir}/certs/
-newcerts = ${directory:ca-dir}/newcerts/
-crl = ${directory:ca-dir}/crl/
+requests = ${directory:srv}/requests/
+private = ${directory:srv}/private/
+certs = ${directory:srv}/certs/
+newcerts = ${directory:srv}/newcerts/
+crl = ${directory:srv}/crl/
 
 [ca-websocket]
 <= certificate-authority
 recipe = slapos.cookbook:certificate_authority.request
-key-file = ${directory:websocket-conf}/websocket.key
-cert-file = ${directory:websocket-conf}/websocket.crt
+key-file = ${directory:etc}/websocket.key
+cert-file = ${directory:etc}/websocket.crt
 executable = {{ nginx_executable }}
 wrapper = ${directory:bin}/nginx-with-ca