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
5
Merge Requests
5
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
Jérome Perrin
slapos
Commits
241a3bb4
Commit
241a3bb4
authored
Jul 29, 2021
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/nginx-push-stream: simplify by using slapos.cookbook:wrapper
parent
1e3d0810
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
25 deletions
+5
-25
software/nginx-push-stream/buildout.hash.cfg
software/nginx-push-stream/buildout.hash.cfg
+1
-5
software/nginx-push-stream/instance-nginx.cfg.in
software/nginx-push-stream/instance-nginx.cfg.in
+4
-6
software/nginx-push-stream/software.cfg
software/nginx-push-stream/software.cfg
+0
-8
software/nginx-push-stream/template-nginx-service.sh.in
software/nginx-push-stream/template-nginx-service.sh.in
+0
-6
No files found.
software/nginx-push-stream/buildout.hash.cfg
View file @
241a3bb4
...
...
@@ -2,14 +2,10 @@
filename = instance.cfg.in
md5sum = eb4c69df9a8dbb94fb76d0a6c11e360f
[template-nginx-service]
filename = template-nginx-service.sh.in
md5sum = 49da09608a6439fb8e1e33c286ac6c36
[template-nginx-configuration]
filename = template-nginx.cfg.in
md5sum = f5658154b82282bc1871f18ddf4529d8
[template-nginx]
filename = instance-nginx.cfg.in
md5sum =
936fea88f5548c4f14e287f1b27dc127
md5sum =
ae50345b1c72db78ada8f36bbe91643b
software/nginx-push-stream/instance-nginx.cfg.in
View file @
241a3bb4
...
...
@@ -27,12 +27,10 @@ ssl = $${:etc}/ssl
# Nginx service
#################################
[nginx-service]
recipe = slapos.recipe.template
url = ${template-nginx-service:output}
output = $${directory:services}/nginx
mode = 0700
virtual-depends =
$${nginx-configuration:ip}
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:services}/nginx
command-line =
${nginx-push-stream-output:nginx} -c $${nginx-configuration:output}
[nginx-configuration]
recipe = slapos.recipe.template
...
...
software/nginx-push-stream/software.cfg
View file @
241a3bb4
[buildout]
extends =
../../stack/slapos.cfg
../../component/dash/buildout.cfg
../../component/nginx/buildout.cfg
./buildout.hash.cfg
...
...
@@ -11,7 +10,6 @@ parts =
nginx-push-stream-module
nginx-push-stream
template
template-nginx-service
template-nginx
[template]
...
...
@@ -20,12 +18,6 @@ url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/template.cfg
mode = 0644
[template-nginx-service]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/template-nginx-service.sh.in
mode = 0644
[template-nginx-configuration]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
...
...
software/nginx-push-stream/template-nginx-service.sh.in
deleted
100644 → 0
View file @
1e3d0810
#!${dash-output:dash}
# BEWARE: This file is operated by slapos node
# BEWARE: It will be overwritten automatically
exec ${nginx-push-stream-output:nginx} \
-c $${nginx-configuration:output}
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