Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
0b21bcfc
Commit
0b21bcfc
authored
Feb 13, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update stunnel section to work with new version
parent
97180299
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
software/mariadb/instance-mariadb.cfg
software/mariadb/instance-mariadb.cfg
+7
-6
software/mariadb/software.cfg
software/mariadb/software.cfg
+1
-1
No files found.
software/mariadb/instance-mariadb.cfg
View file @
0b21bcfc
...
...
@@ -18,7 +18,7 @@ offline = true
[url]
recipe = slapos.cookbook:publishurl
url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-
address
}]:$${stunnel:remote-port}/$${mariadb:database}
url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-
host
}]:$${stunnel:remote-port}/$${mariadb:database}
[mariadb]
recipe = slapos.cookbook:mysql
...
...
@@ -92,10 +92,11 @@ key-file = $${ca-stunnel:key-file}
cert-file = $${ca-stunnel:cert-file}
pid-file = $${basedirectory:run}/stunnel.pid
local-port = $${mariadb:port}
local-
address
= $${mariadb:ip}
remote-
address
= $${slap-network-information:global-ipv6}
local-
host
= $${mariadb:ip}
remote-
host
= $${slap-network-information:global-ipv6}
remote-port = 6446
client = false
post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
[logrotate]
recipe = slapos.cookbook:logrotate
...
...
@@ -128,13 +129,13 @@ dcrond-binary = ${dcron:location}/sbin/crond
cron-entries = $${directory:cron-entries}
crontabs = $${directory:crontabs}
cronstamps = $${directory:cronstamps}
catcher = $${cron-simplelogger:
binary
}
catcher = $${cron-simplelogger:
wrapper
}
binary = $${basedirectory:services}/crond
[cron-simplelogger]
recipe = slapos.cookbook:simplelogger
binary
= $${rootdirectory:bin}/cron_simplelogger
output = $${directory:cronoutput}
wrapper
= $${rootdirectory:bin}/cron_simplelogger
log = $${basedirectory:log}/crond.log
[cron-entry-logrotate]
<= cron
...
...
software/mariadb/software.cfg
View file @
0b21bcfc
...
...
@@ -48,7 +48,7 @@ mode = 0644
[instance-mariadb]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg
md5sum =
135ad8e59a45e053f3aaf75deb35c5b0
md5sum =
d160bb15d8d3a3913706a4ed29c49388
output = ${buildout:directory}/template-mariadb.cfg
mode = 0644
...
...
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