Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Matevz Golob
slapos
Commits
ce2f1c28
Commit
ce2f1c28
authored
Dec 07, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Mar 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Adapt IP certificate to new directory structure
parent
fa8a4f73
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+4
-4
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
ce2f1c28
...
...
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
md5sum =
87558ff8adfebac0e53ebc797b5cdffa
md5sum =
ef1a1b0c1f2466ff81b8d19c212187cf
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
...
...
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
ce2f1c28
...
...
@@ -117,21 +117,21 @@ recipe = plone.recipe.command
update-command = ${:command}
ipv6 = ${slap-network-information:global-ipv6}
ipv4 = {{instance_parameter['ipv4-random']}}
key = ${caddy-directory:
vh-ssl
}/ip-access-${:ipv6}-${:ipv4}.key
certificate = ${caddy-directory:
vh-ssl
}/ip-access-${:ipv6}-${:ipv4}.crt
key = ${caddy-directory:
master-autocert-dir
}/ip-access-${:ipv6}-${:ipv4}.key
certificate = ${caddy-directory:
master-autocert-dir
}/ip-access-${:ipv6}-${:ipv4}.crt
stop-on-error = True
command =
[ -f ${:key} ] && [ -f ${:certificate} ] && exit 0
rm -f ${:key} ${:certificate}
/bin/bash -c ' \
{{ parameter_dict['openssl'] }}
/bin/openssl
req \
{{ parameter_dict['openssl'] }} req \
-new -newkey rsa:2048 -sha256 \
-nodes -x509 -days 36500 \
-keyout ${:key} \
-subj "/CN=Self Signed IP Access" \
-reqexts SAN \
-extensions SAN \
-config <(cat {{ parameter_dict['openssl
'] }}/etc/ssl/openssl.cnf
\
-config <(cat {{ parameter_dict['openssl
_cnf'] }}
\
<(printf "\n[SAN]\nsubjectAltName=IP:${:ipv6},IP:${:ipv4}")) \
-out ${:certificate}'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment