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
5a95c9ed
Commit
5a95c9ed
authored
Sep 29, 2014
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix errors.log permission issue
parent
1a9159f2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
component/nginx/buildout.cfg
component/nginx/buildout.cfg
+1
-0
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-0
software/slaprunner/launcher.in
software/slaprunner/launcher.in
+3
-1
No files found.
component/nginx/buildout.cfg
View file @
5a95c9ed
...
@@ -38,6 +38,7 @@ configure-options =
...
@@ -38,6 +38,7 @@ configure-options =
--with-http_ssl_module
--with-http_ssl_module
--with-mail
--with-mail
--with-mail_ssl_module
--with-mail_ssl_module
--error-log-path=var/log/nginx.error.log
--with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
--with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
--with-cc-opt="-I ${libexpat:location}/include -I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
--with-cc-opt="-I ${libexpat:location}/include -I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
--with-http_dav_module
--with-http_dav_module
...
...
software/slaprunner/common.cfg
View file @
5a95c9ed
...
@@ -43,7 +43,7 @@ mode = 0644
...
@@ -43,7 +43,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
a4f3127bc82ff3a671a65a150f26c969
md5sum =
8a6688ed89f49d32312f2145b7f7d15e
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -110,7 +110,7 @@ mode = 0644
...
@@ -110,7 +110,7 @@ mode = 0644
[template_launcher]
[template_launcher]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/launcher.in
url = ${:_profile_base_location_}/launcher.in
md5sum =
c7f8b6e9ae84aa94686a9cbaaa3dd693
md5sum =
525e37ea8b2acf6209869999b15071a6
filename = launcher.in
filename = launcher.in
mode = 0644
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
software/slaprunner/instance-runner.cfg
View file @
5a95c9ed
...
@@ -281,6 +281,7 @@ path_log = $${directory:log}/nginx.log
...
@@ -281,6 +281,7 @@ path_log = $${directory:log}/nginx.log
path_access_log = $${directory:log}/nginx.access.log
path_access_log = $${directory:log}/nginx.access.log
path_error_log = $${directory:log}/nginx.error.log
path_error_log = $${directory:log}/nginx.error.log
path_tmp = $${directory:tmp}/
path_tmp = $${directory:tmp}/
nginx_prefix = $${buildout:directory}
# Config files
# Config files
path_nginx_conf = $${directory:etc}/nginx.conf
path_nginx_conf = $${directory:etc}/nginx.conf
# Executables
# Executables
...
...
software/slaprunner/launcher.in
View file @
5a95c9ed
...
@@ -3,4 +3,6 @@
...
@@ -3,4 +3,6 @@
# BEWARE: It will be overwritten automatically
# BEWARE: It will be overwritten automatically
# Run nginx
# Run nginx
exec {{ param_nginx_frontend['bin_nginx'] }} -c {{ param_nginx_frontend['path_nginx_conf'] }}
exec {{ param_nginx_frontend['bin_nginx'] }} \
-p {{ param_nginx_frontend['nginx_prefix'] }} \
-c {{ param_nginx_frontend['path_nginx_conf'] }}
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