Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
84cceddd
Commit
84cceddd
authored
Oct 19, 2017
by
eteri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: improve caddy configuration
parent
16ccc2c1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
79 additions
and
0 deletions
+79
-0
software/caddy/Caddyfile.in
software/caddy/Caddyfile.in
+1
-0
software/caddy/instance-caddy.cfg.in
software/caddy/instance-caddy.cfg.in
+47
-0
software/caddy/software.cfg
software/caddy/software.cfg
+25
-0
software/caddy/template-caddy-service.sh.in
software/caddy/template-caddy-service.sh.in
+6
-0
No files found.
software/caddy/Caddyfile.in
0 → 100644
View file @
84cceddd
$${caddy-configuration:ip}:$${caddy-configuration:port}
\ No newline at end of file
software/caddy/instance-caddy.cfg.in
0 → 100644
View file @
84cceddd
[buildout]
parts =
caddy-service
caddy-configuration
publish-connection-information
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[directory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
bin = $${buildout:directory}/bin
srv = $${buildout:directory}/srv
var = $${buildout:directory}/var
run = $${:var}/run
log = $${:var}/log
#www = $${:srv}/www
#ssl = $${:etc}/ssl
#################################
# caddy service
#################################
[caddy-service]
recipe = slapos.recipe.template
url = ${template-caddy-service:output}
output = $${directory:services}/caddy
mode = 0700
virtual-depends =
$${caddy-configuration:ip}
[caddy-configuration]
recipe = slapos.recipe.template
url = ${template-Caddyfile:output}
output = $${directory:etc}/Caddyfile
mode = 0600
access_log = $${directory:log}/caddy-access.log
error_log = $${directory:log}/caddy-error.log
ip = $${slap-network-information:global-ipv6}
local_ip = $${slap-network-information:local-ipv4}
port = 9443
[publish-connection-information]
recipe = slapos.cookbook:publish
url = $${caddy-configuration:ip}
\ No newline at end of file
software/caddy/software.cfg
View file @
84cceddd
...
@@ -2,11 +2,14 @@
...
@@ -2,11 +2,14 @@
extends =
extends =
../../component/caddy/buildout.cfg
../../component/caddy/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/dash/buildout.cfg
parts =
parts =
golang19
golang19
slapos-cookbook
slapos-cookbook
instance-profile
instance-profile
template-caddy-service
template-caddy
caddy
caddy
[instance-profile]
[instance-profile]
...
@@ -25,6 +28,27 @@ directory = ${buildout:directory}/go.work
...
@@ -25,6 +28,27 @@ directory = ${buildout:directory}/go.work
src = ${:directory}/src
src = ${:directory}/src
bin = ${:directory}/bin
bin = ${:directory}/bin
[template-caddy-service]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-caddy-service.sh.in
md5sum = 61da5aea191595962ab020b4197b5390
output = ${buildout:directory}/template-caddy-service.sh.in
mode = 0644
[template-caddy]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-caddy.cfg.in
md5sum = 06ae4dccd5c8557ddb51be8adbb1d6c0
output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644
[template-Caddyfile]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/Caddyfile.in
md5sum = 0bc8e72f2748e22446f850f157321a8c
output = ${buildout:directory}/Caddyfile.in
mode = 0644
[caddy]
[caddy]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
path = ${caddy-repository:location}
path = ${caddy-repository:location}
...
@@ -35,3 +59,4 @@ make-binary = cd ${:path}/caddy && ${:go} install -v
...
@@ -35,3 +59,4 @@ make-binary = cd ${:path}/caddy && ${:go} install -v
environment =
environment =
PATH=${pkgconfig:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s
PATH=${pkgconfig:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gopath:directory}
GOPATH=${gopath:directory}
path-to-bin = ${gopath:bin}/caddy
\ No newline at end of file
software/caddy/template-caddy-service.sh.in
0 → 100644
View file @
84cceddd
#!${dash-output:dash}
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
exec ${caddy:path-to-bin}
-conf $${caddy-configuration:output}
\ No newline at end of file
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