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
Léo-Paul Géneau
slapos
Commits
ba721017
Commit
ba721017
authored
8 years ago
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change monitor interface url to monitor.app.officejs.com
parent
10c105f8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
19 additions
and
19 deletions
+19
-19
software/kvm/common.cfg
software/kvm/common.cfg
+3
-3
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+2
-2
software/kvm/instance-kvm-input-schema.json
software/kvm/instance-kvm-input-schema.json
+2
-2
software/kvm/instance-kvm-resilient.cfg.jinja2
software/kvm/instance-kvm-resilient.cfg.jinja2
+2
-2
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+2
-2
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+2
-2
software/slaprunner/instance-runner-input-schema.json
software/slaprunner/instance-runner-input-schema.json
+2
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-2
No files found.
software/kvm/common.cfg
View file @
ba721017
...
@@ -98,7 +98,7 @@ mode = 0644
...
@@ -98,7 +98,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
mode = 644
md5sum =
341bb135769421fdb1bc3666c921dbb2
md5sum =
88d7622b207760f4c0bdb1b149730478
download-only = true
download-only = true
on-update = true
on-update = true
...
@@ -106,7 +106,7 @@ on-update = true
...
@@ -106,7 +106,7 @@ on-update = true
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
mode = 644
mode = 644
md5sum =
24a717e6ccadf5708b8d5d82a75a7b25
md5sum =
d5c3728faa0972c55506b6cfc2359b59
download-only = true
download-only = true
on-update = true
on-update = true
...
@@ -114,7 +114,7 @@ on-update = true
...
@@ -114,7 +114,7 @@ on-update = true
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
mode = 644
mode = 644
md5sum =
c8481ad7ef56b245e89df76cd19242db
md5sum =
e7c613f15fec8b440180d3c26476ed18
download-only = true
download-only = true
on-update = true
on-update = true
...
...
This diff is collapsed.
Click to expand it.
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
ba721017
...
@@ -72,7 +72,7 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
...
@@ -72,7 +72,7 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }}
config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }}
{% endif -%}
{% endif -%}
config-enable-monitor = {{ dumps(kvm_parameter_dict.get('enable-monitor', True)) }}
config-enable-monitor = {{ dumps(kvm_parameter_dict.get('enable-monitor', True)) }}
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.
node.vifib
.com') }}
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.
app.officejs
.com') }}
config-monitor-username = ${monitor-htpasswd:username}
config-monitor-username = ${monitor-htpasswd:username}
config-monitor-password = ${monitor-htpasswd:passwd}
config-monitor-password = ${monitor-htpasswd:passwd}
...
@@ -240,7 +240,7 @@ recipe = slapos.cookbook:publish
...
@@ -240,7 +240,7 @@ recipe = slapos.cookbook:publish
{% for name, value in publish_dict.items() -%}
{% for name, value in publish_dict.items() -%}
{{ name }} = {{ value }}
{{ name }} = {{ value }}
{% endfor %}
{% endfor %}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.
node.vifib
.com') -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.
app.officejs
.com') -%}
{% if monitor_interface_url -%}
{% if monitor_interface_url -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
{% endif -%}
{% endif -%}
...
...
This diff is collapsed.
Click to expand it.
software/kvm/instance-kvm-input-schema.json
View file @
ba721017
...
@@ -168,13 +168,13 @@
...
@@ -168,13 +168,13 @@
"description"
:
"Give Url of HTML web interface that will be used to render this monitor instance."
,
"description"
:
"Give Url of HTML web interface that will be used to render this monitor instance."
,
"type"
:
"string"
,
"type"
:
"string"
,
"format"
:
"uri"
,
"format"
:
"uri"
,
"default"
:
"https://monitor.
node.vifib
.com"
"default"
:
"https://monitor.
app.officejs
.com"
},
},
"monitor-cors-domains"
:
{
"monitor-cors-domains"
:
{
"title"
:
"Monitor CORS domains"
,
"title"
:
"Monitor CORS domains"
,
"description"
:
"List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain."
,
"description"
:
"List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain."
,
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"monitor.
node.vifib
.com"
"default"
:
"monitor.
app.officejs
.com"
},
},
"enable-http-server"
:
{
"enable-http-server"
:
{
"title"
:
"Enable local http server"
,
"title"
:
"Enable local http server"
,
...
...
This diff is collapsed.
Click to expand it.
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @
ba721017
...
@@ -8,10 +8,10 @@
...
@@ -8,10 +8,10 @@
{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.
node.vifib
.com")} -%}
{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.
app.officejs
.com")} -%}
{% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%}
{% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%}
{% endif -%}
{% endif -%}
{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.
node.vifib
.com') -%}
{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.
app.officejs
.com') -%}
[buildout]
[buildout]
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
...
...
This diff is collapsed.
Click to expand it.
software/kvm/instance-kvm.cfg.jinja2
View file @
ba721017
...
@@ -320,7 +320,7 @@ port = ${httpd:port}
...
@@ -320,7 +320,7 @@ port = ${httpd:port}
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-port = 8026
monitor-httpd-port = 8026
monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.
node.vifib
.com') }}
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.
app.officejs
.com') }}
{% if slapparameter_dict.get('monitor-username', '') -%}
{% if slapparameter_dict.get('monitor-username', '') -%}
username = {{ slapparameter_dict['monitor-username'] }}
username = {{ slapparameter_dict['monitor-username'] }}
{% endif -%}
{% endif -%}
...
@@ -369,7 +369,7 @@ monitor-base-url = ${publish:monitor-base-url}
...
@@ -369,7 +369,7 @@ monitor-base-url = ${publish:monitor-base-url}
monitor-url = ${publish:monitor-url}
monitor-url = ${publish:monitor-url}
monitor-user = ${publish:monitor-user}
monitor-user = ${publish:monitor-user}
monitor-password = ${publish:monitor-password}
monitor-password = ${publish:monitor-password}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.
node.vifib
.com') -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.
app.officejs
.com') -%}
{% if monitor_interface_url -%}
{% if monitor_interface_url -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
{% endif -%}
{% endif -%}
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/common.cfg
View file @
ba721017
...
@@ -54,7 +54,7 @@ mode = 0644
...
@@ -54,7 +54,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 =
f7076baab3b51818d76be2aa8ce23f4c
md5sum =
8fedcc83e2ecb488910ddd8a1c82fe24
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -90,7 +90,7 @@ mode = 0644
...
@@ -90,7 +90,7 @@ mode = 0644
[template-resilient]
[template-resilient]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
md5sum = 1
721ed960ae5b9ae55864bcdc5b1d487
md5sum = 1
60bf71d8a15f1359d80eb5586109781
filename = instance-resilient.cfg.jinja2
filename = instance-resilient.cfg.jinja2
mode = 0644
mode = 0644
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/instance-resilient.cfg.jinja2
View file @
ba721017
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
{% set number_of_instances = 2 %}
{% set number_of_instances = 2 %}
{% endif %}
{% endif %}
{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.
node.vifib
.com")} -%}
{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.
app.officejs
.com")} -%}
{% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
{% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.
node.vifib
.com') -%}
{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.
app.officejs
.com') -%}
{% import 'parts' as parts %}
{% import 'parts' as parts %}
{% import 'replicated' as replicated %}
{% import 'replicated' as replicated %}
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/instance-runner-input-schema.json
View file @
ba721017
...
@@ -103,13 +103,13 @@
...
@@ -103,13 +103,13 @@
"description"
:
"Give Url of HTML web interface that will be used to render this monitor instance."
,
"description"
:
"Give Url of HTML web interface that will be used to render this monitor instance."
,
"type"
:
"string"
,
"type"
:
"string"
,
"format"
:
"uri"
,
"format"
:
"uri"
,
"default"
:
"https://monitor.
node.vifib
.com"
"default"
:
"https://monitor.
app.officejs
.com"
},
},
"monitor-cors-domains"
:
{
"monitor-cors-domains"
:
{
"title"
:
"Monitor CORS domains"
,
"title"
:
"Monitor CORS domains"
,
"description"
:
"List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain."
,
"description"
:
"List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain."
,
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"monitor.
node.vifib
.com"
"default"
:
"monitor.
app.officejs
.com"
},
},
"cpu-usage-ratio"
:
{
"cpu-usage-ratio"
:
{
"title"
:
"CPU Usage Ratio"
,
"title"
:
"CPU Usage Ratio"
,
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/instance-runner.cfg
View file @
ba721017
...
@@ -478,7 +478,7 @@ monitor-url = $${publish:monitor-url}
...
@@ -478,7 +478,7 @@ monitor-url = $${publish:monitor-url}
monitor-user = $${publish:monitor-user}
monitor-user = $${publish:monitor-user}
monitor-password = $${publish:monitor-password}
monitor-password = $${publish:monitor-password}
{% if not slapparameter_dict.get('authorized-key', '') -%}
{% if not slapparameter_dict.get('authorized-key', '') -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.
node.vifib
.com') -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.
app.officejs
.com') -%}
monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url}
monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url}
{% endif -%}
{% endif -%}
#---------------------------
#---------------------------
...
@@ -722,7 +722,7 @@ monitor-httpd-port = $${slap-parameter:monitor-port}
...
@@ -722,7 +722,7 @@ monitor-httpd-port = $${slap-parameter:monitor-port}
{% if slapparameter_dict.get('name', '') -%}
{% if slapparameter_dict.get('name', '') -%}
monitor-title = {{ slapparameter_dict['name'] }}
monitor-title = {{ slapparameter_dict['name'] }}
{% endif -%}
{% endif -%}
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.
node.vifib
.com') }}
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.
app.officejs
.com') }}
{% if slapparameter_dict.get('monitor-username', '') -%}
{% if slapparameter_dict.get('monitor-username', '') -%}
username = {{ slapparameter_dict['monitor-username'] }}
username = {{ slapparameter_dict['monitor-username'] }}
{% endif -%}
{% endif -%}
...
...
This diff is collapsed.
Click to expand it.
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