Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
e713cb4f
Commit
e713cb4f
authored
Jul 22, 2021
by
Stefane Fermigier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature: frontend for mynij proxy
parent
3c9b0bc4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
3 deletions
+36
-3
software/mynij-proxy/buildout.hash.cfg
software/mynij-proxy/buildout.hash.cfg
+1
-1
software/mynij-proxy/instance.cfg.in
software/mynij-proxy/instance.cfg.in
+35
-2
No files found.
software/mynij-proxy/buildout.hash.cfg
View file @
e713cb4f
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
# not need these here).
# not need these here).
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
abf98a4dea9277476cd921714d3f509b
md5sum =
efac4929f6ef6db2fc53b88d05ad8830
software/mynij-proxy/instance.cfg.in
View file @
e713cb4f
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
parts =
parts =
publish-connection-parameter
publish-connection-parameter
mynij-proxy-promise
mynij-proxy-promise
mynij-http-promise
mynij-proxy-http-promise
mynij-proxy-frontend-promise
# Define egg directories to be the one from Software Release
# Define egg directories to be the one from Software Release
# (/opt/slapgrid/...)
# (/opt/slapgrid/...)
...
@@ -51,6 +52,38 @@ command-line = {{ gunicorn_bin }} --bind [${:host}]:${:port} --pid server.pid -k
...
@@ -51,6 +52,38 @@ command-line = {{ gunicorn_bin }} --bind [${:host}]:${:port} --pid server.pid -k
wrapper-path = ${directory:service}/mynij-proxy
wrapper-path = ${directory:service}/mynij-proxy
[request-mynij-proxy-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
name = Mynij Proxy Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config-url = https://[${mynij-proxy-service:host}]:${mynij-proxy-servicer:port}
return = secure_access domain
# Add a promise to make sure the cdn is properly configured
[mynij-proxy-frontend-promise]
<= monitor-promise-base
module = check_url_available
name = mynij-proxy-http-frontend.py
url = ${request-mynij-proxy-frontend:connection-secure_access}
config-url = ${:url}
config-check-secure = 1
[publish-connection-information]
recipe = slapos.cookbook:publish
# By extending monitor publish, all the section deploying monitoring will
# be deployed. The parameters needed for accessing monitoring will be published
<= monitor-publish
server_url = ${html5as:access_url}
# Add dependency to the promise so that frontend sections are processed
# and there is no need to declare the new part in buildout:parts
server-cdn-url = ${mynij-proxy-frontend-promise:url}
[mynij-proxy-promise]
[mynij-proxy-promise]
<= monitor-promise-base
<= monitor-promise-base
module = check_port_listening
module = check_port_listening
...
@@ -59,7 +92,7 @@ config-hostname= ${mynij-proxy-service:host}
...
@@ -59,7 +92,7 @@ config-hostname= ${mynij-proxy-service:host}
config-port = ${mynij-proxy-service:port}
config-port = ${mynij-proxy-service:port}
[mynij-http-promise]
[mynij-
proxy-
http-promise]
<= monitor-promise-base
<= monitor-promise-base
module = check_url_available
module = check_url_available
name = mynij-http-working.py
name = mynij-http-working.py
...
...
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