Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lukas Niegsch
slapos
Commits
717d8475
Commit
717d8475
authored
Oct 24, 2016
by
Rafael Monnerat
Committed by
Julien Muchembled
Oct 25, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: Unhardcode re6st validator url
Not all frontend clusers setup uses the same re6stnet network.
parent
554f390e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/instance-apache-frontend.cfg
software/apache-frontend/instance-apache-frontend.cfg
+2
-4
software/apache-frontend/instance-apache-input-schema.json
software/apache-frontend/instance-apache-input-schema.json
+5
-0
No files found.
software/apache-frontend/common.cfg
View file @
717d8475
...
@@ -69,7 +69,7 @@ mode = 0644
...
@@ -69,7 +69,7 @@ mode = 0644
[template-apache-frontend]
[template-apache-frontend]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-frontend.cfg
url = ${:_profile_base_location_}/instance-apache-frontend.cfg
md5sum =
a245c933193f067457282c6e2c506191
md5sum =
92b69679b3004e160180504012a36f46
output = ${buildout:directory}/template-apache-frontend.cfg
output = ${buildout:directory}/template-apache-frontend.cfg
mode = 0644
mode = 0644
...
...
software/apache-frontend/instance-apache-frontend.cfg
View file @
717d8475
...
@@ -104,6 +104,7 @@ configuration.extra_slave_instance_list =
...
@@ -104,6 +104,7 @@ configuration.extra_slave_instance_list =
configuration.disk-cache-size = 8G
configuration.disk-cache-size = 8G
configuration.trafficserver-autoconf-port = 8083
configuration.trafficserver-autoconf-port = 8083
configuration.trafficserver-mgmt-port = 8084
configuration.trafficserver-mgmt-port = 8084
configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
[frontend-configuration]
[frontend-configuration]
template-log-access = ${template-log-access:target}
template-log-access = ${template-log-access:target}
...
@@ -600,9 +601,6 @@ context =
...
@@ -600,9 +601,6 @@ context =
[monitor-verify-re6st-connectivity]
[monitor-verify-re6st-connectivity]
recipe = slapos.cookbook:check_url_available
recipe = slapos.cookbook:check_url_available
path = $${directory:promise}/re6st-connectivity
path = $${directory:promise}/re6st-connectivity
url = $${
public:
re6st-verification-url}
url = $${
instance-parameter:configuration.
re6st-verification-url}
dash_path = ${dash:location}/bin/dash
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
curl_path = ${curl:location}/bin/curl
[public]
re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
software/apache-frontend/instance-apache-input-schema.json
View file @
717d8475
...
@@ -15,6 +15,11 @@
...
@@ -15,6 +15,11 @@
"type"
:
"integer"
,
"type"
:
"integer"
,
"default"
:
10
"default"
:
10
},
},
"re6st-verification-url"
:
{
"title"
:
"Test Verification URL"
,
"description"
:
"Url to verify if the internet and/or re6stnet is working."
,
"type"
:
"string"
},
"-frontend-authorized-slave-string"
:
{
"-frontend-authorized-slave-string"
:
{
"title"
:
"Authorized Slave String"
,
"title"
:
"Authorized Slave String"
,
"description"
:
"List of SOFTINST-XXX of Slaves, separated by space which is allowed to use custom configuration."
,
"description"
:
"List of SOFTINST-XXX of Slaves, separated by space which is allowed to use custom configuration."
,
...
...
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