Merge branch 'master' into 1.0

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.25'
+version = '1.0.26.dev0'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

software/kvm/common.cfg

@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 341bb135769421fdb1bc3666c921dbb2
+md5sum = 88d7622b207760f4c0bdb1b149730478
 download-only = true
 on-update = true
 
@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 24a717e6ccadf5708b8d5d82a75a7b25
+md5sum = d5c3728faa0972c55506b6cfc2359b59
 download-only = true
 on-update = true
 
@@ -114,7 +114,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = c8481ad7ef56b245e89df76cd19242db
+md5sum = e7c613f15fec8b440180d3c26476ed18
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -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', '')) }}
 {% endif -%}
 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-password = ${monitor-htpasswd:passwd}
 
@@ -240,7 +240,7 @@ recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% 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 -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
 {%   endif -%}

software/kvm/instance-kvm-input-schema.json

@@ -168,13 +168,13 @@
         "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
         "type": "string",
         "format": "uri",
-        "default": "https://monitor.node.vifib.com"
+        "default": "https://monitor.app.officejs.com"
     },
     "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.",
         "type": "string",
-        "default": "monitor.node.vifib.com"
+        "default": "monitor.app.officejs.com"
     },
     "enable-http-server": {
       "title": "Enable local http server",

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -8,10 +8,10 @@
 
 {% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
 {% 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} -%}
 {% 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]
 eggs-directory = {{ eggs_directory }}

software/kvm/instance-kvm.cfg.jinja2

@@ -320,7 +320,7 @@ port = ${httpd:port}
 [monitor-instance-parameter]
 monitor-httpd-port = 8026
 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', '') -%}
 username = {{ slapparameter_dict['monitor-username'] }}
 {%   endif -%}
@@ -369,7 +369,7 @@ monitor-base-url = ${publish:monitor-base-url}
 monitor-url = ${publish:monitor-url}
 monitor-user = ${publish:monitor-user}
 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 -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
 {%   endif -%}

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = f7076baab3b51818d76be2aa8ce23f4c
+md5sum = 8fedcc83e2ecb488910ddd8a1c82fe24
 mode = 0644
 
 [template-runner-import-script]
@@ -90,7 +90,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 1721ed960ae5b9ae55864bcdc5b1d487
+md5sum = 160bf71d8a15f1359d80eb5586109781
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -11,9 +11,9 @@
   {% set number_of_instances = 2 %}
 {% endif %}
 {% 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_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 'replicated' as replicated %}

software/slaprunner/instance-runner-input-schema.json

@@ -103,13 +103,13 @@
             "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
             "type": "string",
             "format": "uri",
-            "default": "https://monitor.node.vifib.com"
+            "default": "https://monitor.app.officejs.com"
         },
         "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.",
             "type": "string",
-            "default": "monitor.node.vifib.com"
+            "default": "monitor.app.officejs.com"
         },
         "cpu-usage-ratio": {
             "title": "CPU Usage Ratio",

software/slaprunner/instance-runner.cfg

@@ -478,7 +478,7 @@ monitor-url = $${publish:monitor-url}
 monitor-user = $${publish:monitor-user}
 monitor-password = $${publish:monitor-password}
 {% 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}
 {% endif -%}
 #---------------------------
@@ -722,7 +722,7 @@ monitor-httpd-port = $${slap-parameter:monitor-port}
 {% if slapparameter_dict.get('name', '') -%}
 monitor-title = {{ slapparameter_dict['name'] }}
 {% 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', '') -%}
 username = {{ slapparameter_dict['monitor-username'] }}
 {% endif -%}

stack/monitor/monitor-logout.py.cgi

-#!{{ python_executable }}
-print("Status: 401 Unauthorized\r\nWWW-Authenticate: Basic realm=\"Private access\"\r\n\r")

stack/monitor/monitor-password.py.cgi

-#!{{ python_executable }}
-
-htpasswd_executable = "{{ htpasswd_executable }}"
-htpasswd_path = "{{ htpasswd_path }}"
-password_changed_once_path = "{{ password_changed_once_path }}"
-
-import cgi
-import cgitb
-import os
-import sys
-
-cgitb.enable(display=0)
-
-def sh(args):
-  os.system(" ".join(["'" + arg.replace("'", "'\\''") + "'" for arg in args]))
-
-def touch(path):
-  open(path, "w").close()
-
-def main():
-  form = cgi.FieldStorage()
-  password = form["password"].value
-  if sh([htpasswd_executable, "-b", htpasswd_path, "admin", password]):
-    sys.stdout.write("Status: 500 Internal Server Error\r\n\r\n")
-    return 1
-  touch(password_changed_once_path)
-  sys.stdout.write("Status: 204 No Content\r\n\r\n")
-  return 0
-
-if __name__ == "__main__":
-  exit(main())

stack/monitor/monitor-run-promise.py.cgi

-#!{{ python_executable }}
-# Put this file in the software release
-promise_wrapper_folder = "{{ promise_wrapper_folder }}"
-
-import cgi
-import cgitb
-import os
-
-cgitb.enable(display=0)
-
-def main():
-  form = cgi.FieldStorage()
-  promise_name = form["service"].value
-  if "/" not in promise_name:
-    promise_path = os.path.join(promise_wrapper_folder, promise_name)
-    os.spawnl(os.P_NOWAIT, promise_path, promise_path)
-  print("Status: 204 No Content\r\n\r")
-
-if __name__ == "__main__":
-  exit(main())

stack/monitor/monitor-service-run.in

-#!/usr/bin/env python
-
-configuration_location = "%(configuration_location)s"
-process_pid_file = "%(process_pid_file)s"
-
-import sys
-import os
-import ConfigParser
-import json
-import subprocess
-
-def loadConfig(config_file):
-  config = ConfigParser.ConfigParser()
-  config.read(config_file)
-  return config
-
-def main():
-  config = loadConfig(configuration_location)
-  script_path = config.get("service", "script-path")
-  executable_folder = os.path.dirname(script_path)
-  executable = os.path.basename(script_path)
-  parameter_json = os.path.join(os.path.abspath(os.path.dirname(__file__)),
-                                'parameters_%%s.json' %% executable)
-  with open(parameter_json, 'w') as fjson:
-    fjson.write(json.dumps(dict(config.items("parameter"))))
-
-  process = subprocess.Popen(
-    [script_path, parameter_json],
-    stdin=None,
-    stdout=subprocess.PIPE,
-    stderr=subprocess.PIPE
-  )
-  with open(process_pid_file, "w") as pidfile:
-    pidfile.write(str(process.pid))
-
-if __name__ == "__main__":
-  if len(sys.argv) == 1:
-    print "Use: %s Monitor_Config_File"
-    sys.exit(1)
-
-  sys.exit(main())
\ No newline at end of file