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
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
Boxiang Sun
slapos
Commits
9c83e5dc
Commit
9c83e5dc
authored
Apr 25, 2017
by
Hardik Juneja
Committed by
Rafael Monnerat
Jun 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change publish to monitor-publish-parameters to avoid conflict
/reviewed-on
!172
parent
85de98bd
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
56 additions
and
56 deletions
+56
-56
software/kvm/common.cfg
software/kvm/common.cfg
+4
-4
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+1
-1
software/kvm/instance-kvm-import.cfg.jinja2.in
software/kvm/instance-kvm-import.cfg.jinja2.in
+4
-4
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/monitor/instance-monitor.cfg.jinja2
software/monitor/instance-monitor.cfg.jinja2
+2
-2
software/monitor/software.cfg
software/monitor/software.cfg
+1
-1
software/powerdns/instance-powerdns-replicate.cfg.jinja2
software/powerdns/instance-powerdns-replicate.cfg.jinja2
+5
-5
software/powerdns/instance-powerdns.cfg
software/powerdns/instance-powerdns.cfg
+4
-4
software/powerdns/software.cfg
software/powerdns/software.cfg
+2
-2
software/re6stnet/instance-re6stnet.cfg.in
software/re6stnet/instance-re6stnet.cfg.in
+1
-1
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+1
-1
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+2
-2
software/slaprunner/instance-runner-import.cfg.in
software/slaprunner/instance-runner-import.cfg.in
+6
-6
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+5
-5
stack/monitor/buildout.hash.cfg
stack/monitor/buildout.hash.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+3
-3
stack/resilient/buildout.hash.cfg
stack/resilient/buildout.hash.cfg
+3
-3
stack/resilient/instance-pull-backup.cfg.in
stack/resilient/instance-pull-backup.cfg.in
+5
-5
stack/resilient/pbsready-import.cfg.in
stack/resilient/pbsready-import.cfg.in
+1
-1
stack/resilient/pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+1
-1
No files found.
software/kvm/common.cfg
View file @
9c83e5dc
...
...
@@ -98,7 +98,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
md5sum =
c66ec96a73470148707937bf96436fd6
md5sum =
a849d4a6060fdb4e9e86917fb77ef153
download-only = true
on-update = true
...
...
@@ -107,7 +107,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
mode = 644
md5sum =
6ef7e38526f024356743e77973f0fb5f
md5sum =
2a3d44d23f35224495af7a84c96b4324
download-only = true
on-update = true
...
...
@@ -116,7 +116,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
mode = 644
md5sum =
700676dff4a3835a9d6cde015d91922e
md5sum =
93e7143b46c6136b7cafe888fac90aba
download-only = true
on-update = true
...
...
@@ -124,7 +124,7 @@ on-update = true
recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm-import.cfg.jinja2.in
md5sum =
30f74f1958bd77e647a1bbe70e286e5a
md5sum =
dc3f3ad9ebd8b3b5c3ded57b91cee9c7
mode = 0644
download-only = true
on-update = true
...
...
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
9c83e5dc
...
...
@@ -254,7 +254,7 @@ recipe = slapos.cookbook:publish
{% if enable_monitoring -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
{% do part_list.append('monitor-base') -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${
publish:monitor-url}&username=${publish:monitor-user}&password=${publish
:monitor-password}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${
monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters
:monitor-password}
{% endif -%}
[buildout]
...
...
software/kvm/instance-kvm-import.cfg.jinja2.in
View file @
9c83e5dc
...
...
@@ -13,10 +13,10 @@ extends =
{{ pbsready_import_template }}
[resilient-publish-connection-parameter]
monitor-base-url = ${
publish
:monitor-base-url}
monitor-url = ${
publish
:monitor-url}
monitor-user = ${
publish
:monitor-user}
monitor-password = ${
publish
:monitor-password}
monitor-base-url = ${
monitor-publish-parameters
:monitor-base-url}
monitor-url = ${
monitor-publish-parameters
:monitor-url}
monitor-user = ${
monitor-publish-parameters
:monitor-user}
monitor-password = ${
monitor-publish-parameters
:monitor-password}
[monitor-instance-parameter]
monitor-httpd-port = 8276
...
...
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @
9c83e5dc
...
...
@@ -68,8 +68,8 @@ backend-url = ${request-kvm:connection-backend-url}
url = ${request-kvm:connection-url}
ipv6 = ${request-kvm:connection-ip}
{% if monitor_dict -%}
monitor-base-url = ${
publish
:monitor-base-url}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${
publish:monitor-url}&username=${publish:monitor-user}&password=${publish
:monitor-password}
monitor-base-url = ${
monitor-publish-parameters
:monitor-base-url}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${
monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters
:monitor-password}
{% endif -%}
[kvm-frontend-url-promise]
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
9c83e5dc
...
...
@@ -393,10 +393,10 @@ tap-ipv4 = ${slap-network-information:tap-ipv4}
{% endif %}
{% endif %}
{% if monitor -%}
monitor-base-url = ${
publish
:monitor-base-url}
monitor-base-url = ${
monitor-publish-parameters
:monitor-base-url}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
{% if monitor_interface_url -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${
publish:monitor-url}&username=${publish:monitor-user}&password=${publish
:monitor-password}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${
monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters
:monitor-password}
{% endif -%}
{% endif -%}
...
...
software/monitor/instance-monitor.cfg.jinja2
View file @
9c83e5dc
...
...
@@ -113,8 +113,8 @@ wrapper-path = ${monitor-directory:promises}/system-MEMORY-usage-check
[publish-connection-information]
recipe = slapos.cookbook:publish
monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${
publish:monitor-url}&username=${publish:monitor-user}&password=${publish
:monitor-password}
server_log_url = ${
publish
:monitor-base-url}/${slap-configuration:private-hash}/
monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${
monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters
:monitor-password}
server_log_url = ${
monitor-publish-parameters
:monitor-base-url}/${slap-configuration:private-hash}/
[monitor-instance-parameter]
instance-configuration =
...
...
software/monitor/software.cfg
View file @
9c83e5dc
...
...
@@ -32,7 +32,7 @@ mode = 0644
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
destination = ${buildout:directory}/template-base-monitor.cfg
md5sum = c
513cf70b8671840b2ba049d2826a661
md5sum = c
3fc83c851568bf0e56393676c489e18
mode = 0644
[template-monitor-distributor]
...
...
software/powerdns/instance-powerdns-replicate.cfg.jinja2
View file @
9c83e5dc
...
...
@@ -117,12 +117,12 @@ recipe = slapos.cookbook:publish
domain = {{ slapparameter_dict.get('domain') }}
slave-amount = {{ slave_instance_list | length }}
ns-record = {{ ns_record }}
monitor-url = ${
publish
:monitor-url}
monitor-user = ${
publish
:monitor-user}
monitor-password = ${
publish
:monitor-password}
monitor-url = ${
monitor-publish-parameters
:monitor-url}
monitor-user = ${
monitor-publish-parameters
:monitor-user}
monitor-password = ${
monitor-publish-parameters
:monitor-password}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
{% 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=${
monitor-publish-parameters
:monitor-url}
{% endif -%}
[buildout]
...
...
@@ -154,4 +154,4 @@ cert_file = ${slap-connection:cert-file}
slave_instance_list =
-dns-quantity = 1
-dns-type = single-default
{%- endif %}
\ No newline at end of file
{%- endif %}
software/powerdns/instance-powerdns.cfg
View file @
9c83e5dc
...
...
@@ -101,9 +101,9 @@ port = $${pdns:port}
[publish-connection-informations]
recipe = slapos.cookbook:publish
monitor-url = $${
publish
:monitor-url}
monitor-user = $${
publish
:monitor-user}
monitor-password = $${
publish
:monitor-password}
monitor-url = $${
monitor-publish-parameters
:monitor-url}
monitor-user = $${
monitor-publish-parameters
:monitor-user}
monitor-password = $${
monitor-publish-parameters
:monitor-password}
#####################
# Power DNS Slave configuration
...
...
@@ -148,4 +148,4 @@ extends = ${monitor-template:output}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
{% endif%}
\ No newline at end of file
{% endif%}
software/powerdns/software.cfg
View file @
9c83e5dc
...
...
@@ -25,7 +25,7 @@ mode = 0644
[template-powerdns]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-powerdns.cfg
md5sum =
06ad5bc18936b04b0bd566353047d02f
md5sum =
7710007c0bd1817e3c1485ea9ece1e23
output = ${buildout:directory}/template-powerdns.cfg
mode = 0644
...
...
@@ -38,7 +38,7 @@ mode = 640
[template-dns-replicate]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
md5sum =
ff2ac1f61fdd57fb349e209b9950f117
md5sum =
57e3010389031eb1a403820c1e9769d5
mode = 0644
[iso-list]
...
...
software/re6stnet/instance-re6stnet.cfg.in
View file @
9c83e5dc
...
...
@@ -201,7 +201,7 @@ port = ${apache-conf:port}
{% do publish_dict.__setitem__('slave-amount', '${re6st-registry:slave-amount}') -%}
[publish]
recipe = slapos.cookbook:publish
monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${
publish:monitor-url}&username=${publish:monitor-user}&password=${publish
:monitor-password}
monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${
monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters
:monitor-password}
{% for name, value in publish_dict.items() -%}
{{ name }} = {{ value }}
{% endfor -%}
...
...
software/re6stnet/software.cfg
View file @
9c83e5dc
...
...
@@ -82,7 +82,7 @@ extra-context =
[template-re6stnet]
< = download-base
filename = instance-re6stnet.cfg.in
md5sum =
9e5e6cf010ec2a329e6bc8def7f95ba7
md5sum =
7d65efffeae3f9ae4e64699303a083b4
[template-apache-conf]
< = download-base
...
...
software/slaprunner/buildout.hash.cfg
View file @
9c83e5dc
...
...
@@ -19,7 +19,7 @@ md5sum = e89d25c1bb7bf507bd96973d444934a6
[template-runner]
filename = instance-runner.cfg
md5sum =
046f21b9541dbf0a7bab83a166263f3c
md5sum =
c76c66c331f1f0d9f416c56ead53e804
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
...
...
@@ -27,7 +27,7 @@ md5sum = feee1dc29d160e0d796dab0ba767745f
[instance-runner-import]
filename = instance-runner-import.cfg.in
md5sum =
154be5ff86a145fca4c1358c15196efa
md5sum =
979dc9c4e901428a1d7f1328851c4513
[template-runner-export-script]
filename = template/runner-export.sh.jinja2
...
...
software/slaprunner/instance-runner-import.cfg.in
View file @
9c83e5dc
...
...
@@ -110,7 +110,7 @@ recipe = collective.recipe.template
input = inline: #!/bin/sh
EXIT_CODE_FILE="$${importer:restore-exit-code-file}"
RECENT_EXIT_CODE_FILE=$(find $${directory:srv} -maxdepth 1 -name "$${importer:restore-exit-code-file-basename}" -mtime -2)
RESILIENT_LOG_URL=$${
publish
:monitor-base-url}/log/$${importer:resilient-log-basename}
RESILIENT_LOG_URL=$${
monitor-publish-parameters
:monitor-base-url}/log/$${importer:resilient-log-basename}
if [ ! -f "$EXIT_CODE_FILE" ]; then
exit 0;
else
...
...
@@ -151,7 +151,7 @@ mode = 755
recipe = slapos.recipe.template
url = ${template-resilient-software-release-information:destination}/${template-resilient-software-release-information:filename}
output = $${directory:cgi-bin}/resilient_software_release_information.py
resilient-log-url = $${
publish
:monitor-base-url}/log/$${importer:resilient-log-basename}
resilient-log-url = $${
monitor-publish-parameters
:monitor-base-url}/log/$${importer:resilient-log-basename}
mode = 0600
[slap-parameter]
...
...
@@ -163,10 +163,10 @@ monitor-username = $${monitor-htpasswd:username}
monitor-password = $${monitor-htpasswd:passwd}
[resilient-publish-connection-parameter]
monitor-base-url = $${
publish
:monitor-base-url}
monitor-url = $${
publish
:monitor-url}
monitor-user = $${
publish
:monitor-user}
monitor-password = $${
publish
:monitor-password}
monitor-base-url = $${
monitor-publish-parameters
:monitor-base-url}
monitor-url = $${
monitor-publish-parameters
:monitor-url}
monitor-user = $${
monitor-publish-parameters
:monitor-user}
monitor-password = $${
monitor-publish-parameters
:monitor-password}
[monitor-instance-parameter]
monitor-httpd-port = 8360
...
...
software/slaprunner/instance-runner.cfg
View file @
9c83e5dc
...
...
@@ -544,7 +544,7 @@ init-password = $${runner-htpasswd:password}
ssh-command = ssh $${user-info:pw-name}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
git-public-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
monitor-base-url = $${
publish
:monitor-base-url}
monitor-base-url = $${
monitor-publish-parameters
:monitor-base-url}
{% if slapparameter_dict.get('no-ipv4-frontend', 'false') == 'false' -%}
url = https://$${request-frontend:connection-domain}
webdav-url = $${request-httpd-frontend:connection-secure_access}/share/
...
...
@@ -557,11 +557,11 @@ public-url = $${apache-httpd:access-url}/public/
{% if slapparameter_dict.get('instance-type', '') != 'resilient' -%}
{% 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}&username=$${publish:monitor-user}&password=$${publish
:monitor-password}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${
monitor-publish-parameters:monitor-url}&username=$${monitor-publish-parameters:monitor-user}&password=$${monitor-publish-parameters
:monitor-password}
{% else -%}
monitor-url = $${
publish
:monitor-url}
monitor-user = $${
publish
:monitor-user}
monitor-password = $${
publish
:monitor-password}
monitor-url = $${
monitor-publish-parameters
:monitor-url}
monitor-user = $${
monitor-publish-parameters
:monitor-user}
monitor-password = $${
monitor-publish-parameters
:monitor-password}
{% endif -%}
#---------------------------
#--
...
...
stack/monitor/buildout.hash.cfg
View file @
9c83e5dc
...
...
@@ -15,4 +15,4 @@
# not need these here).
[monitor2-template]
filename = instance-monitor.cfg.jinja2.in
md5sum =
b829a49a28bd5997d786514c462bb9e1
md5sum =
85188d680f709d9317d97357e0a749aa
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
9c83e5dc
...
...
@@ -277,7 +277,7 @@ check-secure = 1
dash_path = {{ dash_executable_location }}
curl_path = {{ curl_executable_location }}
[
publish
]
[
monitor-publish-parameters
]
# XXX depends on monitor-base section
monitor-base-url = ${monitor-base:base-url}
monitor-url = ${:monitor-base-url}/public/feeds
...
...
@@ -392,8 +392,8 @@ depends =
${promise-monitor-httpd-is-process-older-than-dependency-set:wrapper-path}
[monitor-publish]
monitor-base-url = ${
publish
:monitor-base-url}
monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=settings_configurator&url=${
publish:monitor-url}&username=${publish:monitor-user}&password=${publish
:monitor-password}
monitor-base-url = ${
monitor-publish-parameters
:monitor-base-url}
monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=settings_configurator&url=${
monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters
:monitor-password}
[buildout]
...
...
stack/resilient/buildout.hash.cfg
View file @
9c83e5dc
...
...
@@ -15,11 +15,11 @@
# not need these here).
[pbsready]
filename = pbsready.cfg.in
md5sum =
e30ad911024149c7230999a665883c57
md5sum =
bceb082deb6b3ee9b015c8b04436b52c
[pbsready-import]
filename = pbsready-import.cfg.in
md5sum =
72438e2a4bb66bf4a9a8882a9a2e5c97
md5sum =
9d36d08ac6ae351b598a67db41657cc6
[pbsready-export]
filename = pbsready-export.cfg.in
...
...
@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
[template-pull-backup]
filename = instance-pull-backup.cfg.in
md5sum =
7b4f8ac1a62680d624ac632f9601dab5
md5sum =
2727a34b7c67f6aa4f1aef0acc5ee18d
[template-replicated]
filename = template-replicated.cfg.in
...
...
stack/resilient/instance-pull-backup.cfg.in
View file @
9c83e5dc
...
...
@@ -137,7 +137,7 @@ slave-instance-list = $${slap-parameter:slave_instance_list}
ignore-known-hosts-file = $${slap-parameter:ignore-known-hosts-file}
# To get a verbose feed about PBS state
instance-root-name = $${instance-info-parameters:root-name}
log-url = $${
publish
:monitor-base-url}/private/notifier/
log-url = $${
monitor-publish-parameters
:monitor-base-url}/private/notifier/
status-item-directory = $${directory:notifier-status-items}
[pbs-resilient-status-feed]
...
...
@@ -341,10 +341,10 @@ recipe = slapos.cookbook:publish
ssh-key = $${sshkeys-openssh:public-key-value}
notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
feeds-url = http://[$${notifier:host}]:$${notifier:port}/get/
monitor-base-url = $${
publish
:monitor-base-url}
monitor-url = $${
publish
:monitor-url}
monitor-user = $${
publish
:monitor-user}
monitor-password = $${
publish
:monitor-password}
monitor-base-url = $${
monitor-publish-parameters
:monitor-base-url}
monitor-url = $${
monitor-publish-parameters
:monitor-url}
monitor-user = $${
monitor-publish-parameters
:monitor-user}
monitor-password = $${
monitor-publish-parameters
:monitor-password}
#----------------
#--
...
...
stack/resilient/pbsready-import.cfg.in
View file @
9c83e5dc
...
...
@@ -111,7 +111,7 @@ input = ${resilient-web-takeover-cgi-script-download:target}
output = $${directory:cgi-bin}/web-takeover.cgi
password = $${resilient-web-takeover-password:passwd}
mode = 700
proof-signature-url = $${
publish
:monitor-base-url}/private/resilient/backup.signature
proof-signature-url = $${
monitor-publish-parameters
:monitor-base-url}/private/resilient/backup.signature
# XXX could it be something lighter?
# XXX Add SSL
...
...
stack/resilient/pbsready.cfg.in
View file @
9c83e5dc
...
...
@@ -136,7 +136,7 @@ notifier-binary = ${buildout:bin-directory}/pubsubnotifier
host = $${slap-network-information:global-ipv6}
port = $${notifier-port:port}
instance-root-name = $${instance-info-parameters:root-name}
log-url = $${
publish
:monitor-base-url}/resilient/notifier-status-rss
log-url = $${
monitor-publish-parameters
:monitor-base-url}/resilient/notifier-status-rss
status-item-directory = $${directory:notifier-status-items}
context =
key content notifier:command
...
...
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