Merge branch 'erp5-component' into erp5

component/firefox/buildout.cfg

 [buildout]
 extends =
   ../alsa/buildout.cfg
-  ../xorg/buildout.cfg
-  ../fontconfig/buildout.cfg
+  ../dash/buildout.cfg
   ../dbus/buildout.cfg
+  ../fontconfig/buildout.cfg
   ../gtk-2/buildout.cfg
+  ../libffi/buildout.cfg
   ../libpng/buildout.cfg
-  ../dash/buildout.cfg
+  ../p11-kit/buildout.cfg
+  ../xorg/buildout.cfg
 
 parts =
   firefox
@@ -24,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 29.0.1
+version = 30.0
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 3cbe2bf2b0feb988c14dc2446fe5be9d
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 80070b4e236ef0897b680fb340b7331b
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 469be1f0aaf537f16e17c324bb5baa6b
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 a4979b84a7d68f77d4109282a468f041
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -40,7 +42,7 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${pango:location}/lib:${p11-kit:location}/lib:${pixman:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()

component/gnutls/buildout.cfg

@@ -2,8 +2,8 @@
 extends =
   ../gmp/buildout.cfg
   ../nettle/buildout.cfg
-  ../ncurses/buildout.cfg
-  ../readline/buildout.cfg
+  ../p11-kit/buildout.cfg
+  ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -11,27 +11,31 @@ parts = gnutls
 
 [gpg-error]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
-md5sum = 7c2710ef439f82ac429b88fec88e9a4c
+url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.13.tar.bz2
+md5sum = fe0cfa7e15262ef8fdeee366109e9ff6
 
 [gcrypt]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz
-md5sum = 78f8f8bec4580f75b25816f7896d0389
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.1.tar.bz2
+md5sum = a5a5060dc2f80bcac700ab0236ea47dc
 configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
   CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-lgpg-error -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  LDFLAGS=-L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
 
 [gnutls]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.0.tar.xz
-md5sum = e0cba4ddd923420026ff9739b3bc069a
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.15.tar.xz
+md5sum = ec3b06f80e312137386c5d322183ca5a
 configure-options =
-  --with-libgcrypt-prefix=${gcrypt:location}
   --disable-static
+  --disable-libdane
+  --disable-guile
+  --disable-crywrap
+  --without-tpm
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gmp:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${nettle:location}/include
-  LDFLAGS=-lgcrypt -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${nettle:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  CPPFLAGS=-I${gmp:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/hwloc/buildout.cfg

+[buildout]
+extends =
+  ../../component/libtool/buildout.cfg
+  ../../component/automake/buildout.cfg
+  ../../component/autoconf/buildout.cfg
+parts =
+  hwloc
+
+[hwloc]
+recipe = slapos.recipe.cmmi
+url = http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz
+md5sum = 1f9f9155682fe8946a97c08896109508
+environment =
+  PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:%(PATH)s
+configure-options =
+  --prefix="${buildout:parts-directory}/${:_buildout_section_name_}"
\ No newline at end of file

component/libtasn1/buildout.cfg

+[buildout]
+parts =
+  libtasn1
+
+[libtasn1]
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-3.6.tar.gz
+md5sum = 6ed38e161e11013054f2a2bb4c4da449
+configure-options =
+  --disable-static
+  --disable-gtk-doc-html

component/lua/buildout.cfg

+[buildout]
+extends =
+  ../readline/buildout.cfg
+
+parts =
+  lua
+
+[lua]
+recipe = slapos.recipe.cmmi
+url = http://www.lua.org/ftp/lua-5.2.3.tar.gz
+md5sum = dc7f94ec6ff15c985d2d6ad0f1b35654
+configure-command = make posix
+make-targets =
+  install INSTALL_TOP=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  CMAKE_INCLUDE_PATH=${readline:location}/include
+  CMAKE_LIBRARY_PATH=${readline:location}/lib
+  CPPFLAGS =-I${readline:location}/include
+  LDFLAGS =-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib

component/mariadb/buildout.cfg

@@ -19,10 +19,10 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.11
+version = 10.0.12
 revision = 1
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = faa2ea3f9c6f7bc5f021d299367a7a8d
+md5sum = 6e9a7c075526f8f2f83ad8e0933bab2f
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0

component/p11-kit/buildout.cfg

+[buildout]
+parts =
+  p11-kit
+
+extends =
+  ../libffi/buildout.cfg
+  ../libtasn1/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+[p11-kit]
+recipe = slapos.recipe.cmmi
+url = http://p11-glue.freedesktop.org/releases/p11-kit-0.20.2.tar.gz
+md5sum = 757b97ee4ac0ce598661a90cd784c4f1
+configure-options =
+  --disable-static
+  --disable-doc-html
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig:${libtasn1:location}/lib/pkgconfig

component/slapos/buildout.cfg

@@ -122,9 +122,9 @@ setuptools = 1.4.2
 # incompatible with slapos package generation.
 pyOpenSSL = 0.13.1
 
-Jinja2 = 2.7.2
+Jinja2 = 2.7.3
 MarkupSafe = 0.23
-Werkzeug = 0.9.4
+Werkzeug = 0.9.6
 buildout-versions = 1.7
 cmd2 = 0.6.7
 collective.recipe.template = 1.11
@@ -134,7 +134,7 @@ meld3 = 1.0.0
 mr.developer = 1.30
 netaddr = 0.7.11
 pyparsing = 2.0.2
-six = 1.6.1
+six = 1.7.2
 slapos.core = 1.1.2
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.cmmi = 0.2
@@ -152,7 +152,11 @@ cliff = 1.6.1
 
 # Required by:
 # slapos.core==1.1.2
-netifaces = 0.10.3
+netifaces = 0.10.4
+
+# Required by:
+# slapos.core==1.1.2
+psutil = 2.1.1
 
 # Required by:
 # slapos.core==1.1.2

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz
-md5sum = 0f5459cde43cb269e5120ecd2c671ced
+url = http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
+md5sum = 0544ef6d7afd8ca797935ccc2685a9ed
 configure-options =
   --disable-static
   --enable-readline

component/trafficserver/buildout.cfg

+[buildout]
+extends =
+  ../../component/lua/buildout.cfg
+  ../../component/hwloc/buildout.cfg
+  ../../component/pkgconfig/buildout.cfg
+  ../../component/libtool/buildout.cfg
+  ../../component/make/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../component/tcl/buildout.cfg
+  ../../component/libexpat/buildout.cfg
+  ../../component/pcre/buildout.cfg
+  ../../component/libcap/buildout.cfg
+  ../../component/flex/buildout.cfg
+  ../../component/ncurses/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/zlib/buildout.cfg
+
+parts =
+  trafficserver
+
+[trafficserver]
+recipe = slapos.recipe.cmmi
+url = http://apache.claz.org/trafficserver/trafficserver-4.2.1.tar.bz2
+md5sum = 18f7d56650cba260c8cce3bf4abfa56c
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-openssl=${openssl:location}
+  --with-expat=${libexpat:location}
+  --with-pcre=${pcre:location}
+  --with-lua=${lua:location}
+  --with-ncurses=${ncurses:location}
+  --with-tcl=${tcl:location}/lib/
+  --with-zlib=${zlib:location}
+environment =
+  PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS = -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib
+make-target =
+  check
+  install

slapos/recipe/erp5testnode/__init__.py

@@ -54,8 +54,9 @@ class Recipe(GenericBaseRecipe):
     if software_path_list:
       CONFIG["software_path_list"] = "[software_list]"
       CONFIG["software_path_list"] += \
-          "\npath_list = %s" % ",".join(software_path_list)
-
+          "\npath_list = %s" % ",".join(software_path_list) 
+    CONFIG['computer_id'] = self.buildout['slap-connection']['computer-id']
+    CONFIG['server_url'] = self.buildout['slap-connection']['server-url']
     configuration_file = self.createFile(
       self.options['configuration-file'],
       self.substituteTemplate(
@@ -87,6 +88,8 @@ class Recipe(GenericBaseRecipe):
         lock_file=self.options['httpd-lock-file'],
         ip=self.options['httpd-ip'],
         port=self.options['httpd-port'],
+        software_access_port=self.options['httpd-software-access-port'],
+        testnode_srv_directory=self.options['srv-directory'],
         error_log=os.path.join(self.options['httpd-log-directory'],
                                'httpd-error.log'),
         access_log=os.path.join(self.options['httpd-log-directory'],
@@ -94,6 +97,7 @@ class Recipe(GenericBaseRecipe):
         certificate=self.options['httpd-cert-file'],
         key=self.options['httpd-key-file'],
         testnode_log_directory=self.options['log-directory'],
+        testnode_software_directory=self.options['software-directory'],
     )
     config_file = self.createFile(self.options['httpd-conf-file'],
        self.substituteTemplate(self.getTemplateFilename('httpd.conf.in'),
@@ -107,4 +111,4 @@ class Recipe(GenericBaseRecipe):
     # create empty html page to not allow listing of /
     page = open(os.path.join(self.options['log-directory'], "index.html"), "w")
     page.write("<html/>")
-    page.close()
+    page.close()
\ No newline at end of file

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -2,8 +2,10 @@
 slapos_directory = %(slapos_directory)s
 working_directory = %(working_directory)s
 test_suite_directory = %(test_suite_directory)s
+software_directory = %(software_directory)s
 log_directory = %(log_directory)s
 run_directory = %(run_directory)s
+srv_directory = %(srv_directory)s
 proxy_host = %(proxy_host)s
 proxy_port = %(proxy_port)s
 node_quantity = %(node_quantity)s
@@ -13,6 +15,9 @@ ipv6_address = %(ipv6_address)s
 test_suite_master_url = %(test_suite_master_url)s
 httpd_ip = %(httpd_ip)s
 httpd_port = %(httpd_port)s
+httpd_software_access_port = %(httpd_software_access_port)s
+computer_id = %(computer_id)s
+server_url = %(server_url)s
 
 # Binaries
 git_binary = %(git_binary)s

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -50,12 +50,38 @@ SSLHonorCipherOrder On
 SSLCipherSuite RC4-SHA:HIGH:!ADH
 SSLProxyEngine On
 
-DocumentRoot "%(testnode_log_directory)s"
 
+#DocumentRoot "%(testnode_log_directory)s"
 # Directory protection
-<Directory />
-    Options Indexes FollowSymLinks
-    IndexOptions FancyIndexing
-    order allow,deny
-    Allow from All
-</Directory>
+#<Directory />
+#    Options Indexes FollowSymLinks
+#    IndexOptions FancyIndexing
+#    order allow,deny
+#    Allow from All
+#</Directory>
\ No newline at end of file
+
+# Directory protection
+<VirtualHost *:%(port)s>
+    SSLEngine on
+    RewriteRule (.*) http://[%(ip)s]:%(port)s/VirtualHostBase/https/[%(ip)s]:%(port)s/VirtualHostRoot/$1 [L,P]
+    DocumentRoot "%(testnode_log_directory)s"
+    <Directory />
+        Options Indexes FollowSymLinks
+        IndexOptions FancyIndexing
+        order allow,deny
+        Allow from All
+    </Directory>
+</VirtualHost>
+
+Listen [%(ip)s]:%(software_access_port)s
+<VirtualHost *:%(software_access_port)s>
+    SSLEngine on
+    RewriteRule (.*) http://[%(ip)s]:%(software_access_port)s/VirtualHostBase/https/[%(ip)s]:%(software_access_port)s/VirtualHostRoot/$1 [L,P]
+    DocumentRoot "%(testnode_software_directory)s"
+    <Directory />
+        Options FollowSymLinks
+        IndexOptions FancyIndexing
+        order allow,deny
+        Allow from All
+   </Directory>
+</VirtualHost>

software/ajaxplorer/software.cfg

@@ -234,7 +234,7 @@ lock-file = 2.0
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/apache-frontend/common.cfg

@@ -13,7 +13,8 @@ extends =
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
-  ../../component/squid/buildout.cfg
+  ../../component/trafficserver/buildout.cfg
+
 # Monitoring stack
   ../../stack/monitor/buildout.cfg
 
@@ -33,7 +34,6 @@ parts +=
   dcron
   logrotate
   rdiff-backup
-  squid
 
 [slapos-toolbox]
 recipe = zc.recipe.egg
@@ -67,7 +67,7 @@ mode = 0644
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = f5ec3d3b29d20ccdb00e3b64aa588fa5
+md5sum = 070275aa2b2941702cc9ec637fe778e1
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 
@@ -144,12 +144,6 @@ url = ${:_profile_base_location_}/templates/template-log-access.conf.in
 md5sum = f85005b430978f3bd24ee7ce11b0e304
 mode = 640
 
-[template-squid-configuration]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/templates/squid.conf.jinja2
-md5sum = f17753fa87da074bc949b2967a330099
-mode = 640
-
 [template-empty]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/empty.in
@@ -162,3 +156,12 @@ url = ${:_profile_base_location_}/templates/wrapper.in
 output = ${buildout:directory}/template-wrapper.cfg
 mode = 0644
 md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
+
+[template-trafficserver-records-config]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/trafficserver/${:filename}
+md5sum = 950a19be225a25309a3bda3f61fb5f6a
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = records.config.jinja2
+download-only = true
+mode = 0644

software/apache-frontend/instance-apache-frontend.cfg

@@ -9,16 +9,11 @@ parts =
   certificate-authority
   logrotate-entry-apache
   logrotate-entry-apache-cached
-  logrotate-entry-squid
   apache-frontend
   apache-cached
   switch-apache-softwaretype
   frontend-apache-graceful
   cached-apache-graceful
-  squid-service
-  squid-prepare
-  squid-reload
-  promise-squid
   dynamic-template-default-vh
   not-found-html
   promise-frontend-apache-configuration
@@ -28,6 +23,14 @@ parts =
   promise-apache-frontend-v6-https
   promise-apache-frontend-v6-http
   promise-apache-cached
+
+  trafficserver-launcher
+  trafficserver-reload
+  trafficserver-configuration-directory
+  trafficserver-records-config
+  trafficserver-remap-config
+  trafficserver-storage-config
+
 ## Monitoring part
 ###Parts to add for monitoring
   certificate-authority
@@ -36,6 +39,7 @@ parts =
   deploy-index
   deploy-settings-cgi
   deploy-status-cgi
+  deploy-status-history-cgi
   setup-static-files
   certificate-authority
   zero-parameters
@@ -47,6 +51,10 @@ parts =
 ## Monitor for apache
   monitor-current-log-access
   monitor-backup-log-access
+  monitor-ats-cache-stats-wrapper
+  monitor-apache-configuration-verification
+  monitor-verify-re6st-connectivity
+
 extends = ${monitor-template:output}
 
 
@@ -79,6 +87,7 @@ crontabs = $${:etc}/crontabs
 cronstamps = $${:etc}/cronstamps
 ca-dir = $${:srv}/ssl
 
+
 [switch-apache-softwaretype]
 recipe = slapos.cookbook:softwaretype
 single-default = $${dynamic-default-template-slave-list:rendered}
@@ -117,14 +126,6 @@ apache-directory = ${apache-2.2:location}
 apache-ipv6 = $${instance-parameter:ipv6-random}
 apache-https-port = $${instance-parameter:configuration.port}
 
-[monitor-current-log-access]
-< = monitor-directory-access
-source = $${directory:log}
-
-[monitor-backup-log-access]
-< = monitor-directory-access
-source = $${directory:logrotate-backup}
-
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 rendered = $${buildout:directory}/$${:filename}
@@ -135,6 +136,7 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key slap_software_type instance-parameter:slap-software-type
     key slapparameter_dict instance-parameter:configuration
+    section directory directory
     $${:extra-context}
 
 [dynamic-template-default-vh]
@@ -333,8 +335,8 @@ cache-access-log = $${directory:log}/frontend-apache-access-cached.log
 cache-error-log = $${directory:log}/frontend-apache-error-cached.log
 cache-pid-file = $${directory:run}/httpd-cached.pid
 
-# Comunication with squid
-cache-port = 26010
+# Comunication with ats
+cache-port = $${trafficserver-variable:input-port}
 cache-through-port = 26011
 
 # Create wrapper for "apachectl conftest" in bin
@@ -433,77 +435,70 @@ sharedscripts = true
 notifempty = true
 create = true
 
-[logrotate-entry-squid]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = squid
-log = $${squid-cache:cache-log-path} $${squid-cache:access-log-path}
-frequency = daily
-rotatep-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${apache-configuration:pid-file} SIGHUP
-sharedscripts = true
-notifempty = true
-create = true
-
-######################
-#  Squid deployment
-######################
-[squid-directory]
+#################
+# Trafficserver
+#################
+[trafficserver-directory]
 recipe = slapos.cookbook:mkdirectory
-squid-cache = $${directory:srv}/squid_cache
-
-[squid-cache]
-prepare-path = $${directory:etc-run}/squid-prepare
-wrapper-path = $${directory:service}/squid
-binary-path = ${squid:location}/sbin/squid
-configuration-path = $${directory:etc}/squid.cfg
-cache-path = $${squid-directory:squid-cache}
-ip = $${instance-parameter:ipv4-random}
-port = $${apache-configuration:cache-port}
-backend-ip = $${instance-parameter:ipv4-random}
-backend-port = $${apache-configuration:cache-through-port}
-open-port = $${instance-parameter:configuration.open-port}
-access-log-path = $${directory:log}/squid-access.log
-cache-log-path = $${directory:log}/squid-cache.log
-pid-filename-path = $${directory:run}/squid.pid
-
-[squid-configuration]
-< = jinja2-template-base
-template = ${template-squid-configuration:target}
-rendered = $${squid-cache:configuration-path}
-extra-context =
-      key ip squid-cache:ip
-      key port squid-cache:port
-      key backend_ip squid-cache:backend-ip
-      key backend_port squid-cache:backend-port
-      key cache_path squid-cache:cache-path
-      key access_log_path squid-cache:access-log-path
-      key cache_log_path squid-cache:cache-log-path
-      key pid_filename_path squid-cache:pid-filename-path
-      key open_port squid-cache:open-port
-
-[squid-service]
+configuration = $${directory:etc}/trafficserver
+local-state = $${directory:var}/trafficserver
+bin_path = ${trafficserver:location}/bin
+log = $${directory:log}/trafficserver
+cache-path = $${directory:srv}/ats_cache
+
+[trafficserver-variable]
+wrapper-path = $${directory:service}/trafficserver
+reload-path = $${directory:etc-run}/trafficserver-reload
+local-ip = $${instance-parameter:ipv4-random}
+input-port = 23432
+hostname = $${slap-parameter:frontend-name}
+remap = map / http://$${instance-parameter:ipv4-random}:$${apache-configuration:cache-through-port}
+disk-cache-config = $${trafficserver-directory:cache-path} 8G volume=$${slap-parameter:frontend-name}
+
+[trafficserver-configuration-directory]
+recipe = plone.recipe.command
+command = cp -rn ${trafficserver:location}/etc/trafficserver/* $${:target}
+target = $${trafficserver-directory:configuration}
+
+[trafficserver-launcher]
 recipe = slapos.cookbook:wrapper
-command-line = $${squid-cache:binary-path} -N -f $${squid-configuration:rendered}
-wrapper-path = $${squid-cache:wrapper-path}
+command-line = ${trafficserver:location}/bin/traffic_cop
+wrapper-path = $${trafficserver-variable:wrapper-path}
+environment = TS_ROOT=$${buildout:directory}
 
-[squid-prepare]
+[trafficserver-reload]
 recipe = slapos.cookbook:wrapper
-command-line = $${squid-cache:binary-path} -z -f $${squid-configuration:rendered}
-wrapper-path = $${squid-cache:prepare-path}
+command-line = ${trafficserver:location}/bin/traffic_line -x
+wrapper-path = $${trafficserver-variable:reload-path}
+environment = TS_ROOT=$${buildout:directory}
 
-[squid-reload]
-recipe = slapos.cookbook:wrapper
-command-line = ${buildout:bin-directory}/killpidfromfile $${squid-cache:pid-filename-path} SIGHUP
-wrapper-path = $${directory:etc-run}/squid-reload
+[trafficserver-records-config]
+< = jinja2-template-base
+template = ${template-trafficserver-records-config:location}/${template-trafficserver-records-config:filename}
+rendered = $${trafficserver-directory:configuration}/records.config
+mode = 700
+context =
+    import os_module os
+    section ats_directory trafficserver-directory
+    section ats_configuration trafficserver-variable
 
-[promise-squid]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promise}/squid
-hostname = $${instance-parameter:ipv4-random}
-port = $${apache-configuration:cache-port}
+[trafficserver-remap-config]
+< = jinja2-template-base
+template = ${template-empty:target}
+rendered = $${trafficserver-configuration-directory:target}/remap.config
+mode = 700
+context =
+    key content trafficserver-variable:remap
+
+[trafficserver-storage-config]
+< = jinja2-template-base
+template = ${template-empty:target}
+rendered = $${trafficserver-configuration-directory:target}/storage.config
+mode = 700
+context =
+    key content trafficserver-variable:disk-cache-config
 
-# End of Squid part
+### End of ATS sections
 
 ### Apaches Graceful and promises
 [frontend-apache-graceful]
@@ -577,3 +572,72 @@ server_url = $${slap-connection:server-url}
 software_release_url = $${slap-connection:software-release-url}
 key_file = $${slap-connection:key-file}
 cert_file = $${slap-connection:cert-file}
+
+[slap-parameter]
+# Define default parameter(s) that will be used later, in case user didn't
+# specify it
+# All parameters are available through the configuration.XX syntax.
+# All possible parameters should have a default.
+domain = example.org
+public-ipv4 =
+port = 4443
+plain_http_port = 8080
+server-admin = admin@example.com
+apache_custom_https = ""
+apache_custom_http = ""
+apache-key =
+apache-certificate =
+open-port = 80 443
+extra_slave_instance_list =
+frontend-name =
+
+
+#######
+# Monitoring sections
+#
+
+[monitor-current-log-access]
+< = monitor-directory-access
+source = $${directory:log}
+
+[monitor-backup-log-access]
+< = monitor-directory-access
+source = $${directory:logrotate-backup}
+
+# Produce ATS Cache stats
+[monitor-ats-cache-stats-wrapper]
+< = jinja2-template-base
+template = ${template-wrapper:output}
+rendered = $${monitor-directory:monitoring-cgi}/ats-cache-stats
+mode = 0700
+command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_shell $${monitor-ats-cache-stats-config:rendered})</pre>"
+extra-context =
+  key content monitor-ats-cache-stats-wrapper:command
+
+[monitor-ats-cache-stats-config]
+< = jinja2-template-base
+template = ${template-empty:target}
+rendered = $${trafficserver-configuration-directory:target}/cache-config.stats
+mode = 644
+context =
+    raw content show:cache-stats
+
+# Display result of apache configuration check
+[monitor-apache-configuration-verification]
+< = jinja2-template-base
+template = ${template-wrapper:output}
+rendered = $${monitor-directory:monitoring-cgi}/front-httpd-configuration
+mode = 0700
+command = echo "<pre>$($${apache-configuration:frontend-configuration-verification})</pre>"
+extra-context =
+  key content :command
+
+[monitor-verify-re6st-connectivity]
+recipe = slapos.cookbook:check_url_available
+path = $${monitor-directory:monitor-custom-scripts}/re6st-connectivity
+url = $${public:re6st-verification-url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[public]
+re6st-verification-url = http://[2001:67c:1254:4::1]/index.html

software/apache-frontend/software.cfg

@@ -2,7 +2,7 @@
 extends = common.cfg
 
 [versions]
-Jinja2 = 2.7.2
+Jinja2 = 2.7.3
 MarkupSafe = 0.23
 PyRSS2Gen = 1.1
 Werkzeug = 0.9.4
@@ -28,7 +28,7 @@ pycrypto = 2.6.1
 pyparsing = 2.0.2
 pytz = 2014.3
 rdiff-backup = 1.0.5
-six = 1.6.1
+six = 1.7.2
 slapos.cookbook = 0.87
 slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2

software/apache-frontend/templates/squid.conf.jinja2

-refresh_pattern .   0 20% 4320 max-stale=604800
-
-# Dissallow cachemgr access
-http_access deny manager
-
-# Squid service configuration
-http_port {{ ip }}:{{ port }} accel defaultsite={{ ip }}
-
-cache_peer {{ backend_ip }} parent {{ backend_port }} 0 no-query originserver name=backend
-
-acl our_sites port {{ open_port }}
-http_access allow our_sites
-cache_peer_access backend allow our_sites
-cache_peer_access backend deny all
-
-# Drop squid headers
-# via off
-# reply_header_access X-Cache-Lookup deny all
-# reply_header_access X-Squid-Error deny all
-# reply_header_access X-Cache deny all
-
-header_replace X-Forwarded-For
-follow_x_forwarded_for allow all
-forwarded_for on
-
-cache_dir aufs {{ cache_path }} 5000 16 256
-
-# Use 1Go of RAM
-cache_mem 1024 MB
-# But do not keep big object in RAM
-maximum_object_size_in_memory 2048 KB
-
-# Log
-access_log {{ access_log_path }}
-cache_log {{ cache_log_path }}
-pid_filename {{ pid_filename_path }}

software/apache-frontend/templates/trafficserver/records.config.jinja2

+#
+#
+# Process Records Config File
+#
+# <RECORD-TYPE> <NAME> <TYPE> <VALUE (till end of line)>
+#
+#	RECORD-TYPE:	CONFIG, LOCAL
+#	NAME:		name of variable
+#	TYPE:		INT, STRING, FLOAT
+#	VALUE:		Initial value for record
+#
+#
+# *NOTE*: All options covered in this file should be documented in the
+#         administration guide or the addendum:
+#
+#
+##############################################################################
+#
+# System Variables
+#
+##############################################################################
+CONFIG proxy.config.proxy_name STRING {{ ats_configuration['hostname'] }}
+CONFIG proxy.config.local_state_dir {{ ats_directory['local-state'] }}
+CONFIG proxy.config.config_dir STRING {{ ats_directory['configuration'] }}
+CONFIG proxy.config.bin_path STRING {{ ats_directory['bin_path'] }}
+CONFIG proxy.config.proxy_binary_opts STRING -M
+CONFIG proxy.config.env_prep STRING example_prep.sh
+CONFIG proxy.config.alarm_email STRING nobody
+CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
+CONFIG proxy.config.output.logfile STRING traffic.out
+CONFIG proxy.config.snapshot_dir STRING snapshots
+CONFIG proxy.config.system.mmap_max INT 2097152
+##############################################################################
+#
+# Main threads configuration (worker threads). Also see configurations for
+# SSL threads, disk I/O threads and task threads in their respective areas.
+#
+##############################################################################
+CONFIG proxy.config.exec_thread.autoconfig INT 1
+CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5
+CONFIG proxy.config.exec_thread.limit INT 2
+CONFIG proxy.config.accept_threads INT 1
+##############################################################################
+#
+# Local Manager
+#
+##############################################################################
+CONFIG proxy.config.admin.admin_user STRING admin
+CONFIG proxy.config.admin.number_config_bak INT 3
+CONFIG proxy.config.admin.user_id STRING {{ '#%s' % os_module.geteuid() }}
+##############################################################################
+#
+# Process Manager
+#
+##############################################################################
+CONFIG proxy.config.admin.autoconf_port INT 8083
+CONFIG proxy.config.process_manager.mgmt_port INT 8084
+##############################################################################
+#
+# In order to only bind a specific IP, use the following config, as in
+# the example below. Note - this can contain two addresses, one for IPv4
+# sockets and one for IPv6 sockets.
+#
+##############################################################################
+LOCAL proxy.local.incoming_ip_to_bind STRING {{ ats_configuration['local-ip'] }}
+#LOCAL proxy.local.outgoing_ip_to_bind STRING 10.0.143.32
+#LOCAL proxy.local.incoming_ip_to_bind STRING 192.168.101.17 fc07:192:168:101::17
+##############################################################################
+#
+# Alarm Configuration
+#
+##############################################################################
+   # execute alarm as "<abs_path>/<bin> "<MSG_STRING_FROM_PROXY>""
+CONFIG proxy.config.alarm.bin STRING example_alarm_bin.sh
+CONFIG proxy.config.alarm.abs_path STRING NULL
+##############################################################################
+#
+# HTTP Engine
+#
+##############################################################################
+   ##########
+   # basics #
+   ##########
+   # The server ports are listed here. These are separated by spaces or commas.
+   # Each port is a colon separated list of values, which must include a
+   # port number. The order is irrelevant. Other options are
+   # ipv4 - Use IPv4 (default)
+   # ipv6 - Use IPv6
+   # tr-in - Transparent inbound.
+   # tr-out - Transparent outbound.
+   # tr-full - Fully transparent (inbound and outbound).
+   # tr-pass - Transparently Pass-through non-HTTP traffic (in conjuction with tr-in).
+   # ssl - SSL terminated port.
+   # blind - Blind tunnel port (CONNECT only)
+   # ip-in=[addr] - Bind inbound IP address (listen for client).
+   # ip-out=[addr] - Bind outbound IP address (connect to origin server).
+   # ip-resolve=[style] - Set the IP resolution style.
+   #
+   # Note - address types must agree with each other and the ipv4/ipv6
+   # option if specified. IPv6 addresses must be enclosed in brackets.
+   # ip-out can be repeated as long as each address is a different
+   # family. If ip-in is specified as an IPv6 address, the port is
+   # forced to IPv6. Transparent ports cannot be bound to an IP
+   # address on the transparent side.
+   #
+   # The '=' is optional for any option with a value.
+   #
+   # Example 1: Port 8080 IPv6 inbound transparent, and port 80 IPv4
+   # "8080:ipv6:tr-in 80"
+   #
+   # Example 2: Listen on standard http and https ports for IPv4 and IPv6,
+   # fully transparent on the http ports. Also provide an non-transparent
+   # port at address 192.168.1.56 on port 8080.
+   # "80:ipv4:tr-full tr-full:80:ipv6 443:ipv4:ssl 443:ssl:ipv6 ip-in=192.168.1.56:8080"
+   #
+CONFIG proxy.config.http.server_ports STRING {{ ats_configuration['local-ip'] + ':' + ats_configuration['input-port'] }}
+   # Ports on the origin server to which a blind tunnel may connect.
+CONFIG proxy.config.http.connect_ports STRING 443 563
+   # The via settings have four values
+   #  0 - Do not modify / set this via header
+   #  1 - Update the via, with normal verbosity
+   #  2 - Update the via, with higher verbosity
+   #  3 - Update the via, with highest verbosity
+CONFIG proxy.config.http.insert_request_via_str INT 2
+CONFIG proxy.config.http.insert_response_via_str INT 2
+   # Insert a Server: header, this has three values
+   #   0 - Don't add or modify the Server: header
+   #   1 - Add a Server: header
+   #   2 - Only add a Server: header if one doesn't exist already
+CONFIG proxy.config.http.response_server_enabled INT 1
+CONFIG proxy.config.http.insert_age_in_response INT 1
+CONFIG proxy.config.http.enable_url_expandomatic INT 0
+CONFIG proxy.config.http.no_dns_just_forward_to_parent INT 0
+CONFIG proxy.config.http.uncacheable_requests_bypass_parent INT 1
+CONFIG proxy.config.http.keep_alive_enabled_in INT 1
+CONFIG proxy.config.http.keep_alive_enabled_out INT 1
+CONFIG proxy.config.http.chunking_enabled INT 1
+   # send http11 requests:
+   #   0 - Never
+   #   1 - Always
+   #   2 - if the server has returned http1.1 before
+   #   3 - if the client request is 1.1 & the server has returned 1.1 before
+   # If use_client_addr is set to 1, options 2 and 3 cause the proxy to use
+   # the client HTTP version for upstream requests.
+CONFIG proxy.config.http.send_http11_requests INT 1
+   # Share server connections
+   #  0 - Never
+   #  1 - Share, with a single global connection pool
+   #  2 - Share, with a connection pool per worker thread
+CONFIG proxy.config.http.share_server_sessions INT 2
+   ##########################
+   # HTTP referer filtering #
+   ##########################
+CONFIG proxy.config.http.referer_filter INT 0
+CONFIG proxy.config.http.referer_format_redirect INT 0
+CONFIG proxy.config.http.referer_default_redirect STRING http://www.example.com/
+   ##############################
+   # parent proxy configuration #
+   ##############################
+CONFIG proxy.config.http.parent_proxy_routing_enable INT 0
+CONFIG proxy.config.http.parent_proxy.retry_time INT 300
+   # Parent fail threshold is the number of request that must
+   # fail within the retry window for the parent to be marked
+   # down
+CONFIG proxy.config.http.parent_proxy.fail_threshold INT 10
+CONFIG proxy.config.http.parent_proxy.total_connect_attempts INT 4
+CONFIG proxy.config.http.parent_proxy.per_parent_connect_attempts INT 2
+CONFIG proxy.config.http.parent_proxy.connect_attempts_timeout INT 30
+CONFIG proxy.config.http.forward.proxy_auth_to_parent INT 0
+   ###################################
+   # HTTP connection timeouts (secs) #
+   ###################################
+   # out: proxy -> origin server connection
+   # in : ua -> proxy connection
+CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 115
+CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 120
+CONFIG proxy.config.http.transaction_no_activity_timeout_in INT 30
+CONFIG proxy.config.http.transaction_no_activity_timeout_out INT 30
+CONFIG proxy.config.http.transaction_active_timeout_in INT 900
+CONFIG proxy.config.http.transaction_active_timeout_out INT 0
+CONFIG proxy.config.http.accept_no_activity_timeout INT 120
+CONFIG proxy.config.http.background_fill_active_timeout INT 60
+CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.5
+   ##################################
+   # origin server connect attempts #
+   ##################################
+CONFIG proxy.config.http.connect_attempts_max_retries INT 6
+CONFIG proxy.config.http.connect_attempts_max_retries_dead_server INT 3
+CONFIG proxy.config.http.connect_attempts_rr_retries INT 3
+CONFIG proxy.config.http.connect_attempts_timeout INT 30
+CONFIG proxy.config.http.post_connect_attempts_timeout INT 1800
+CONFIG proxy.config.http.down_server.cache_time INT 300
+CONFIG proxy.config.http.down_server.abort_threshold INT 10
+   ##################################
+   # congestion control             #
+   ##################################
+CONFIG proxy.config.http.congestion_control.enabled INT 0
+   #############################
+   # negative response caching #
+   #############################
+CONFIG proxy.config.http.negative_caching_enabled INT 0
+CONFIG proxy.config.http.negative_caching_lifetime INT 1800
+   #########################
+   # proxy users variables #
+   #########################
+CONFIG proxy.config.http.anonymize_remove_from INT 0
+CONFIG proxy.config.http.anonymize_remove_referer INT 0
+CONFIG proxy.config.http.anonymize_remove_user_agent INT 0
+CONFIG proxy.config.http.anonymize_remove_cookie INT 0
+CONFIG proxy.config.http.anonymize_remove_client_ip INT 0
+CONFIG proxy.config.http.anonymize_insert_client_ip INT 1
+CONFIG proxy.config.http.anonymize_other_header_list STRING NULL
+CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 1
+   ############
+   # security #
+   ############
+CONFIG proxy.config.http.push_method_enabled INT 0
+
+#  ###################################
+#  # HTTP Quick filtering (security) #
+#  ###################################
+#  this functionality is moved to ip_allow.config
+
+   #################
+   # cache control #
+   #################
+CONFIG proxy.config.http.cache.http INT 1
+   # Enabling this setting allows the proxy to cache empty documents. This currently
+   # requires that the response has a Content-Length: header, with a value of "0".
+CONFIG proxy.config.http.cache.allow_empty_doc INT 0
+CONFIG proxy.config.http.cache.ignore_client_no_cache INT 1
+CONFIG proxy.config.http.cache.ims_on_client_no_cache INT 1
+CONFIG proxy.config.http.cache.ignore_server_no_cache INT 0
+CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 0
+CONFIG proxy.config.http.normalize_ae_gzip INT 0
+   # cache responses to cookies has 5 options:
+   #   0 - do not cache any responses to cookies
+   #   1 - cache for any content-type
+   #   2 - cache only for image types
+   #   3 - cache for all but text content-types
+   #   4 - cache for all but text content-types except OS response
+   #       without "Set-Cookie" or with "Cache-Control: public"
+   # See also cache-responses-to-cookies in cache.config.
+CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 1
+CONFIG proxy.config.http.cache.ignore_authentication INT 0
+CONFIG proxy.config.http.cache.cache_urls_that_look_dynamic INT 1
+CONFIG proxy.config.http.cache.enable_default_vary_headers INT 0
+   #  when_to_revalidate has 5 options:
+   #    0 - default. use cache directives or heuristic
+   #    1 - stale if heuristic
+   #    2 - always stale (always revalidate)
+   #    3 - never stale
+   #    4 - always revalidate if request is conditional, else default is used
+CONFIG proxy.config.http.cache.when_to_revalidate INT 0
+   # Some old MSIE browsers don't send no-cache headers to
+   # reverse proxies or transparent caches, this variable controls
+   # when to add no-cache headers to MSIE requests:
+   #  -1 - no-cache is never added, stats are not updated
+   #   0 - default; no-cache not added to MSIE requests
+   #   1 - no-cache added to IMS MSIE requests
+   #   2 - no-cache added to all MSIE requests
+CONFIG proxy.config.http.cache.when_to_add_no_cache_to_msie_requests INT -1
+   # required headers: three options:
+   #   0 - No required headers to make document cachable
+   #   1 - "Last-Modified:", "Expires:", or "Cache-Control: max-age" required
+   #   2 - explicit lifetime required, "Expires:" or "Cache-Control: max-age"
+CONFIG proxy.config.http.cache.required_headers INT 2
+CONFIG proxy.config.http.cache.max_stale_age INT 604800
+CONFIG proxy.config.http.cache.range.lookup INT 1
+   ########################
+   # heuristic expiration #
+   ########################
+CONFIG proxy.config.http.cache.heuristic_min_lifetime INT 3600
+CONFIG proxy.config.http.cache.heuristic_max_lifetime INT 86400
+CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10
+CONFIG proxy.config.http.cache.fuzz.time INT 240
+CONFIG proxy.config.http.cache.fuzz.probability FLOAT 0.005
+   #########################################
+   # dynamic content & content negotiation #
+   #########################################
+CONFIG proxy.config.http.cache.vary_default_text STRING NULL
+CONFIG proxy.config.http.cache.vary_default_images STRING NULL
+CONFIG proxy.config.http.cache.vary_default_other STRING NULL
+   ##############################################################
+   # The HTTP stats are expensive, turn off you don't need them #
+   ##############################################################
+CONFIG proxy.config.http.enable_http_stats INT 1
+
+##############################################################################
+#
+# Customizable User Response Pages
+#
+##############################################################################
+   # 1 - enable customizable user response pages in only the "default" directory
+   # 2 - enable language-targeted user response pages
+CONFIG proxy.config.body_factory.enable_customizations INT 1
+CONFIG proxy.config.body_factory.enable_logging INT 0
+   # 0 - never suppress generated responses
+   # 1 - always suppress generated responses
+   # 2 - suppress responses for intercepted traffic
+CONFIG proxy.config.body_factory.response_suppression_mode INT 0
+##############################################################################
+#
+# Net Subsystem
+#
+##############################################################################
+CONFIG proxy.config.net.connections_throttle INT 30000
+   # Enable defer accept / accept filtering. On Linux, this is a timeout, sec.
+CONFIG proxy.config.net.defer_accept INT 45
+##############################################################################
+#
+# Cluster Subsystem
+#
+##############################################################################
+   # cluster type requires restart to change
+   # 1 is full clustering, 2 is mgmt only, 3 is no clustering
+LOCAL proxy.local.cluster.type INT 3
+CONFIG proxy.config.cluster.cluster_port INT 8086
+CONFIG proxy.config.cluster.rsport INT 8088
+CONFIG proxy.config.cluster.mcport INT 8089
+CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
+CONFIG proxy.config.cluster.mc_ttl INT 1
+CONFIG proxy.config.cluster.log_bogus_mc_msgs INT 1
+CONFIG proxy.config.cluster.ethernet_interface STRING lo
+##############################################################################
+#
+# Cache
+#
+##############################################################################
+CONFIG proxy.config.cache.permit.pinning INT 0
+   # default the ram cache size to AUTO_SIZE (-1) based on cache size
+   #   (approximately 10 MB of RAM cache per GB of disk cache)
+   # alternatively, set to a fixed value such as 21474836480 (20GB)
+CONFIG proxy.config.cache.ram_cache.size INT 1G
+CONFIG proxy.config.cache.ram_cache_cutoff INT 4194304
+   # Replacement algorithm
+   #  0 : Clocked Least Frequently Used by Size (CLFUS) w/optional compression
+   #  1 : LRU w/o optional compression - trivially simple
+CONFIG proxy.config.cache.ram_cache.algorithm INT 0
+   # Filter inserts into the RAM cache to ensure that they have been seen at
+   # least once.  For LRU, this provides scan resistance. Note that CLFUS
+   # already requires that a document have history before it is inserted, so
+   # for CLFUS, setting this option means that a document must be seen three
+   # times before it is added to the RAM cache.
+CONFIG proxy.config.cache.ram_cache.use_seen_filter INT 0
+   # Compress the content of the ram cache:
+   #  0 : no compression
+   #  1 : fastlz (extremely fast, relatively low compression)
+   #  2 : libz (moderate speed, reasonable compression)
+   #  3 : liblzma (very slow, high compression)
+   #  NOTE: compression runs on task threads.  To use more cores for
+   #  compression, increase proxy.config.task_threads.
+CONFIG proxy.config.cache.ram_cache.compress INT 0
+   # The maximum number of alternates that are allowed for any given URL.
+   # It is not possible to strictly enforce this if the variable
+   #   'proxy.config.cache.vary_on_user_agent' is set to 1.
+   # The default value for 'proxy.config.cache.vary_on_user_agent' is 0.
+   # (0 disables the maximum number of alts check)
+CONFIG proxy.config.cache.limits.http.max_alts INT 5
+   # The target size of a contiguous fragment on disk.
+   # Acceptable values are powers of 2, e.g. 65536, 131072, 262144, 524288, 1048576, 2097152.
+   # Larger could waste memory on slow connections, smaller could waste seeks.
+CONFIG proxy.config.cache.target_fragment_size INT 1048576
+   # The maximum size of a document that will be stored in the cache.
+   # (0 disables the maximum document size check)
+CONFIG proxy.config.cache.max_doc_size INT 0
+   # enable the cache to read from an object while it is being added to the cache
+CONFIG proxy.config.cache.enable_read_while_writer INT 0
+   # This controls how many objects (average) the disk caches can hold, and
+   # how much memory it'll consume for the directory structure.
+CONFIG proxy.config.cache.min_average_object_size INT 8000
+   # How many I/O threads to allocate per disk (spindle). Be aware that RAID
+   # disks would show up to TS as a single spindle.
+CONFIG proxy.config.cache.threads_per_disk INT 8
+   # Time (in ms) to delay until retrying to acquire a cache lock. Setting
+   # this low can reduce latencies in some cases, but can consume more CPU.
+   # If you experience CPU spinning, try increasing this setting.
+CONFIG proxy.config.cache.mutex_retry_delay INT 2
+   # The interim storage disks. Must use raw disks.
+   # Only support at most 8 interim disks now. e.g.
+   # proxy.config.cache.interim.storage STRING /dev/sda /dev/sdb/
+LOCAL proxy.config.cache.interim.storage STRING NULL
+##############################################################################
+#
+# DNS
+#
+##############################################################################
+CONFIG proxy.config.dns.search_default_domains INT 0
+CONFIG proxy.config.dns.splitDNS.enabled INT 0
+CONFIG proxy.config.dns.max_dns_in_flight INT 2048
+   # Additional URL expansions for http DNS lookup
+CONFIG proxy.config.dns.url_expansions STRING NULL
+CONFIG proxy.config.dns.round_robin_nameservers INT 0
+CONFIG proxy.config.dns.nameservers STRING NULL
+CONFIG proxy.config.dns.resolv_conf STRING /etc/resolv.conf
+   # This provides additional resilience against DNS forgery, particularly in
+   # forward or transparent proxies, but requires that the resolver populates
+   # the queries section of the response properly.
+CONFIG proxy.config.dns.validate_query_name INT 0
+##############################################################################
+#
+# HostDB
+#
+##############################################################################
+   # in entries, may not be changed while running
+   # note that in order to increase hostdb.size, hostdb.storage_size should
+   # also be increase. These are best guesses, you will have to monitor this.
+CONFIG proxy.config.hostdb.size INT 120000
+CONFIG proxy.config.hostdb.storage_size INT 32M
+   # ttl modes:
+   #   0 = obey
+   #   1 = ignore
+   #   2 = min(X,ttl)
+   #   3 = max(X,ttl)
+CONFIG proxy.config.hostdb.ttl_mode INT 0
+   # in minutes...
+CONFIG proxy.config.hostdb.timeout INT 1440
+   # round-robin addresses for single clients
+   # (can cause authentication problems)
+CONFIG proxy.config.hostdb.strict_round_robin INT 0
+##############################################################################
+#
+# Logging Config
+#
+##############################################################################
+   # possible values for logging_enabled:
+   #   0: no logging at all
+   #   1: log errors only
+   #   2: log transactions only
+   #   3: full logging (errors + transactions)
+CONFIG proxy.config.log.logging_enabled INT 3
+CONFIG proxy.config.log.max_secs_per_buffer INT 5
+CONFIG proxy.config.log.max_space_mb_for_logs INT 25000
+CONFIG proxy.config.log.max_space_mb_for_orphan_logs INT 25
+CONFIG proxy.config.log.max_space_mb_headroom INT 1000
+CONFIG proxy.config.log.hostname STRING localhost
+CONFIG proxy.config.log.logfile_dir STRING {{ ats_directory['log'] }}
+CONFIG proxy.config.log.logfile_perm STRING rw-r--r--
+CONFIG proxy.config.log.custom_logs_enabled INT 0
+CONFIG proxy.config.log.squid_log_enabled INT 1
+CONFIG proxy.config.log.squid_log_is_ascii INT 0
+CONFIG proxy.config.log.squid_log_name STRING squid
+CONFIG proxy.config.log.squid_log_header STRING NULL
+CONFIG proxy.config.log.common_log_enabled INT 0
+CONFIG proxy.config.log.common_log_is_ascii INT 1
+CONFIG proxy.config.log.common_log_name STRING common
+CONFIG proxy.config.log.common_log_header STRING NULL
+CONFIG proxy.config.log.extended_log_enabled INT 0
+CONFIG proxy.config.log.extended_log_is_ascii INT 0
+CONFIG proxy.config.log.extended_log_name STRING extended
+CONFIG proxy.config.log.extended_log_header STRING NULL
+CONFIG proxy.config.log.extended2_log_enabled INT 0
+CONFIG proxy.config.log.extended2_log_is_ascii INT 1
+CONFIG proxy.config.log.extended2_log_name STRING extended2
+CONFIG proxy.config.log.extended2_log_header STRING NULL
+CONFIG proxy.config.log.separate_icp_logs INT 0
+CONFIG proxy.config.log.separate_host_logs INT 0
+   # Log collation allows you to do "remote logging"
+LOCAL proxy.local.log.collation_mode INT 0
+CONFIG proxy.config.log.collation_host STRING NULL
+CONFIG proxy.config.log.collation_port INT 8085
+CONFIG proxy.config.log.collation_secret STRING foobar
+CONFIG proxy.config.log.collation_host_tagged INT 0
+CONFIG proxy.config.log.collation_retry_sec INT 5
+CONFIG proxy.config.log.rolling_enabled INT 1
+CONFIG proxy.config.log.rolling_interval_sec INT 86400
+CONFIG proxy.config.log.rolling_offset_hr INT 0
+CONFIG proxy.config.log.rolling_size_mb INT 10
+CONFIG proxy.config.log.auto_delete_rolled_files INT 1
+CONFIG proxy.config.log.sampling_frequency INT 1
+##############################################################################
+#
+# Reverse Proxy
+#
+##############################################################################
+CONFIG proxy.config.reverse_proxy.enabled INT 1
+CONFIG proxy.config.header.parse.no_host_url_redirect STRING NULL
+##############################################################################
+#
+# URL Remap Rules
+#
+##############################################################################
+CONFIG proxy.config.url_remap.default_to_server_pac INT 0
+CONFIG proxy.config.url_remap.default_to_server_pac_port INT -1
+   # To enable forward proxy, you must turn off remap_required
+CONFIG proxy.config.url_remap.remap_required INT 1
+   # Pristine host header is the "original" (request) header. Make sure your
+   # origin expects them in reverse proxy.
+CONFIG proxy.config.url_remap.pristine_host_hdr INT 1
+##############################################################################
+#
+# SSL Termination
+#
+##############################################################################
+   # The number of SSL threads is a multiplier of number of CPUs and
+   # proxy.config.exec_thread.autoconfig.scale by default. You can
+   # override that here (set it to a non-zero value).
+CONFIG proxy.config.ssl.number.threads INT 0
+   # The following three variables can be
+   # set to 0 to disable SSLv2, SSLv3, and/or TLSv1.
+   # SSLv2 is disabled by default for security concern.
+CONFIG proxy.config.ssl.SSLv2 INT 0
+CONFIG proxy.config.ssl.SSLv3 INT 1
+CONFIG proxy.config.ssl.TLSv1 INT 1
+   # The following two variables control the Cipher Suite traffic Server
+   # uses for HTTPS connnections and whether to prefer the client
+   # selected (default) or the server selected
+   # Our default SSL Cipher Suite tries to be reasonably fast and strong.
+CONFIG proxy.config.ssl.server.cipher_suite STRING RC4-SHA:AES128-SHA:DES-CBC3-SHA:AES256-SHA:ALL:!aNULL:!EXP:!LOW:!MD5:!SSLV2:!NULL
+CONFIG proxy.config.ssl.server.honor_cipher_order INT 0
+   # Control if SSL should perform content compression or not
+CONFIG proxy.config.ssl.compression INT 0
+   # Client certification level should be:
+   # 0 no client certificates
+   # 1 client certificates optional
+   # 2 client certificates required
+CONFIG proxy.config.ssl.client.certification_level INT 0
+   # Server cert chain filename is the name of the global cert chain file
+   # that is added to every cert in ssl_multicert.config. This file is only
+   # loaded if there are configurations in ssl_multicert.config.
+CONFIG proxy.config.ssl.server.cert_chain.filename STRING NULL
+   # This is the path that SSL certificates files are relative to. Certificate
+   # names specified in ssl_multicert.config will be located relative to this path.
+CONFIG proxy.config.ssl.server.cert.path STRING etc/trafficserver
+   # If any private key is not contained in the certificate file, you must
+   # fill in the private key path. Private key names specified in
+   # ssl_multicert.config will be located relative to this path.
+CONFIG proxy.config.ssl.server.private_key.path STRING etc/trafficserver
+   # The CA file name and path are the
+   # certificate authority certificate that
+   # client certificates will be verified against.
+CONFIG proxy.config.ssl.CA.cert.filename STRING NULL
+CONFIG proxy.config.ssl.CA.cert.path STRING etc/trafficserver
+   ################################
+   # client related configuration #
+   ################################
+CONFIG proxy.config.ssl.client.verify.server INT 0
+CONFIG proxy.config.ssl.client.cert.filename STRING NULL
+CONFIG proxy.config.ssl.client.cert.path STRING etc/trafficserver
+   # Fill in private key file and path only if the client's
+   # private key is not contained in the client certificate file.
+CONFIG proxy.config.ssl.client.private_key.filename STRING NULL
+CONFIG proxy.config.ssl.client.private_key.path STRING etc/trafficserver
+   # The CA file name and path are the
+   # certificate authority certificate that
+   # server certificates will be verified against.
+CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL
+CONFIG proxy.config.ssl.client.CA.cert.path STRING etc/trafficserver
+##############################################################################
+#
+# ICP Configuration. NOTE! ICP is currently broken NOTE!
+#
+##############################################################################
+   # icp modes
+   #   enabled=0 ICP disabled
+   #   enabled=1 Allow receive of ICP queries
+   #   enabled=2 Allow send/receive of ICP queries
+CONFIG proxy.config.icp.enabled INT 0
+CONFIG proxy.config.icp.icp_interface STRING NULL
+CONFIG proxy.config.icp.icp_port INT 3130
+CONFIG proxy.config.icp.multicast_enabled INT 0
+CONFIG proxy.config.icp.query_timeout INT 2
+##############################################################################
+#
+# Scheduled Update Configuration
+#
+##############################################################################
+CONFIG proxy.config.update.enabled INT 0
+CONFIG proxy.config.update.force INT 0
+CONFIG proxy.config.update.retry_count INT 10
+CONFIG proxy.config.update.retry_interval INT 2
+CONFIG proxy.config.update.concurrent_updates INT 100
+##############################################################################
+#
+# Socket send/recv buffer sizes (0 == don't call setsockopt() )
+#
+##############################################################################
+   # out: proxy -> os connection
+   # in : ua -> proxy connection
+CONFIG proxy.config.net.sock_send_buffer_size_in INT 262144
+CONFIG proxy.config.net.sock_recv_buffer_size_in INT 0
+CONFIG proxy.config.net.sock_send_buffer_size_out INT 0
+CONFIG proxy.config.net.sock_recv_buffer_size_out INT 0
+##############################################################################
+#
+# User Overridden Configurations Below
+#
+##############################################################################
+CONFIG proxy.config.core_limit INT -1
+##############################################################################
+#
+# Debugging
+#
+##############################################################################
+  # Uses a regular expression to match the debugging topic name, performance
+  # will be affected!
+CONFIG proxy.config.diags.debug.enabled INT 0
+CONFIG proxy.config.diags.debug.tags STRING http.*|dns.*
+  # Great for tracking down memory leaks, but you need to use the
+  # ink allocators
+CONFIG proxy.config.dump_mem_info_frequency INT 0
+
+  # Log the source code location of diagnostic messages.
+CONFIG proxy.config.diags.show_location INT 0
+##############################################################################
+#
+# Configuration for Reclaimable InkFreeList memory pool
+#
+# NOTE: The following options are meaningfull only when Traffic Server is
+#       compiled with the following option to configure:
+#
+#	    --enable-reclaimable-freelist
+#
+##############################################################################
+CONFIG proxy.config.allocator.enable_reclaim INT 1
+  # The value of reclaim_factor should be in the 0.0 to 1.0 range. Allocators
+  # use it to calculate size of unused memory, which is used to determine when
+  # to reclaim memory. The larger the value, the more aggressive reclaims.
+CONFIG proxy.config.allocator.reclaim_factor FLOAT 0.300000
+  # Allocator will reclaim memory only when it continuously satisfy the reclaim
+  # condition for max_overage continuous checks.
+CONFIG proxy.config.allocator.max_overage INT 3
+  #  For debugging, enable debug_filter, which is a bit-map with these fields:
+  #     bit 0: reclaim memory in ink_freelist_new
+  #     bit 1: allocate memory from partial-free Chunks(if exist) or OS
+CONFIG proxy.config.allocator.debug_filter INT 0
+
+##############################################################################
+#
+# Slow Log
+#
+##############################################################################
+  # Log any request that takes more then x number of milliseconds, needs
+  # to be > 0 to be enabled
+CONFIG proxy.config.http.slow.log.threshold INT 0
+##############################################################################
+#
+# Thread pool for "misc" tasks, plugins etc. 2 is a good minimum.
+#
+##############################################################################
+CONFIG proxy.config.task_threads INT 2

software/backupserver/software.cfg

@@ -288,7 +288,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/boinc-client/software.cfg

@@ -170,7 +170,7 @@ lock-file = 2.0
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/condor/software.cfg

@@ -206,7 +206,7 @@ lock-file = 2.0
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/davstorage/development.cfg

@@ -63,7 +63,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.14
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.cookbook==0.24

software/davstorage/software.cfg

@@ -63,7 +63,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.14
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.cookbook==0.24

software/erp5-util-testing/software.cfg

@@ -86,7 +86,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.28.5
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # erp5.util==0.4.7

software/erp5testnode/instance-default.cfg

@@ -24,13 +24,14 @@ storage-path = $${buildout:directory}/.password
 
 [testnode]
 recipe = slapos.cookbook:erp5testnode
-
 slapos-directory = $${directory:slapos}
 working-directory = $${directory:testnode}
 test-suite-directory = $${directory:test-suite}
 proxy-host = $${slap-network-information:global-ipv6}
 proxy-port = 5000
 log-directory = $${directory:log}
+srv-directory = $${rootdirectory:srv}
+software-directory = $${directory:software}
 run-directory = $${directory:run}
 test-node-title = $${slap-parameter:test-node-title}
 node-quantity = $${slap-parameter:node-quantity}
@@ -50,8 +51,10 @@ httpd-lock-file = $${basedirectory:run}/httpd.lock
 httpd-conf-file = $${rootdirectory:etc}/httpd.conf
 httpd-wrapper = $${rootdirectory:bin}/httpd
 httpd-port = 9080
+httpd-software-access-port = 9081
 httpd-ip = $${slap-network-information:global-ipv6}
 httpd-log-directory = $${basedirectory:log}
+httpd-software-directory = $${directory:software}
 httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
 httpd-key-file = $${rootdirectory:etc}/httpd-private.key
 
@@ -151,6 +154,7 @@ testnode = $${rootdirectory:srv}/testnode
 test-suite = $${rootdirectory:srv}/test_suite
 log = $${basedirectory:log}/testnode
 run = $${basedirectory:run}/testnode
+software = $${rootdirectory:srv}/software
 shellinabox = $${rootdirectory:srv}/shellinabox
 ca-dir = $${rootdirectory:srv}/ca
 

software/erp5testnode/software.cfg

@@ -74,7 +74,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = 9bb380748d5f6618ffa480e6d660217c
+md5sum = 8c6a106be8e7af2b30506a9a2e24044d
 
 [networkcache]
 # signature certificates of the following uploaders.
@@ -185,7 +185,7 @@ pytz =
 # pin version of setuptools
 setuptools = 2.2
 
-Jinja2 = 2.7.2
+Jinja2 = 2.7.3
 MarkupSafe = 0.23
 PyXML = 0.8.5
 Werkzeug = 0.9.4
@@ -205,7 +205,7 @@ psutil = 2.1.0
 pyOpenSSL = 0.14
 pyparsing = 2.0.2
 pytz = 2014.2
-six = 1.6.1
+six = 1.7.2
 slapos.core = 1.0.5
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.build = 0.12
@@ -228,7 +228,7 @@ lock-file = 2.0
 
 # Required by:
 # slapos.core==1.0.5
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # cffi==0.8.2

software/html5as/software.cfg

@@ -92,7 +92,7 @@ cffi = 0.8.2
 cryptography = 0.4
 plone.recipe.command = 1.1
 pyOpenSSL = 0.14
-six = 1.6.1
+six = 1.7.2
 
 # Required by:
 # cffi==0.8.2
@@ -134,7 +134,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.34.0

software/jio/software.cfg

@@ -68,7 +68,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/kumofs/software.cfg

@@ -107,7 +107,7 @@ signature-certificate-list =
   
   # Required by:
   # slapos.core==0.33.1
-  netifaces = 0.10.3
+  netifaces = 0.10.4
   
   # Required by:
   # slapos.cookbook==0.71.1

software/kvm/software.cfg

@@ -175,7 +175,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # websockify==0.5.1

software/mariadb/software.cfg

@@ -114,7 +114,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35

software/memcached/software.cfg

@@ -70,7 +70,7 @@ lxml = 2.3.4
 
 # Required by:
 # slapos.core==0.2
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.2

software/officejs/software.cfg

@@ -69,7 +69,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/postgres/software.cfg

@@ -162,7 +162,7 @@ hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.core==0.34
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.34

software/redis-server/software.cfg

@@ -183,7 +183,7 @@ lock-file = 2.0
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/seleniumrunner/software.cfg

@@ -50,7 +50,7 @@ mode = 0644
 # pin version of setuptools
 setuptools = 2.2
 
-Jinja2 = 2.7.2
+Jinja2 = 2.7.3
 MarkupSafe = 0.23
 Werkzeug = 0.9.4
 buildout-versions = 1.7
@@ -63,7 +63,7 @@ mr.developer = 1.30
 plone.recipe.command = 1.1
 pyOpenSSL = 0.14
 pyparsing = 2.0.2
-six = 1.6.1
+six = 1.7.2
 slapos.cookbook = 0.87
 slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2

software/slapos-in-partition/software.cfg

@@ -154,7 +154,7 @@ itsdangerous = 0.23
 lxml = 3.2.3
 meld3 = 0.6.10
 netaddr = 0.7.10
-netifaces = 0.10.3
+netifaces = 0.10.4
 pytz = 2013d
 requests = 1.2.3
 slapos.cookbook = 0.83.1

software/slapos-testing/software.cfg

@@ -184,7 +184,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==1.0.0
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.cookbook==0.85

software/slaprunner-lite/software.cfg

@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.core==0.34
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.34.0

software/slaprunner/software.cfg

@@ -239,7 +239,7 @@ hexagonit.recipe.download = 1.7nxd002
 
 # Required by:
 # slapos.core==0.34
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.34.0

software/trac-svn/software.cfg

@@ -346,7 +346,7 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.34.0

software/zabbix-agent/software.cfg

@@ -71,7 +71,7 @@ Flask = 0.9
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.core==0.35.1

software/zimbra-kvm/software.cfg

@@ -99,7 +99,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.33.1

stack/boinc/buildout.cfg

@@ -226,7 +226,7 @@ lock-file = 2.0
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.34.0

stack/cloudooo.cfg

@@ -76,7 +76,7 @@ develop +=
   ${:parts-directory}/cloudooo
 
 [versions]
-Jinja2 = 2.7.2
+Jinja2 = 2.7.3
 MarkupSafe = 0.23
 Paste = 1.7.5.1
 PasteScript = 1.7.5
@@ -101,7 +101,7 @@ python-magic = 0.4.6
 pytz = 2014.3
 rdiff-backup = 1.0.5
 requests = 2.3.0
-six = 1.6.1
+six = 1.7.2
 slapos.core = 1.1.2
 slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2

stack/erp5/buildout.cfg

@@ -568,7 +568,7 @@ ZODB3 = 3.10.5-ZMinitagePatched-ZODB33105
 cloudooo = 1.2.5-dev
 
 # use newer version than specified in ZTK
-Jinja2 = 2.7.2
+Jinja2 = 2.7.3
 PasteDeploy = 1.5.2
 Pygments = 1.6
 argparse = 1.2.1
@@ -635,7 +635,7 @@ PyXML = 0.8.5
 Pympler = 0.3.1
 StructuredText = 2.11.1
 WSGIUtils = 0.7
-Werkzeug = 0.9.4
+Werkzeug = 0.9.6
 apache-libcloud = 0.14.1
 astroid = 1.1.1
 async = 0.6.1
@@ -676,7 +676,7 @@ python-ldap = 2.4.15
 python-magic = 0.4.6
 python-memcached = 1.53
 pytz = 2014.4
-qrcode = 4.0.4
+qrcode = 5.0.1
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 slapos.recipe.build = 0.12
@@ -775,8 +775,8 @@ psutil = 2.1.1
 requests = 2.3.0
 
 # Required by:
-# qrcode==4.0.4
-six = 1.6.1
+# qrcode==5.0.1
+six = 1.7.2
 
 # Required by:
 # slapos.core==1.1.2

stack/lamp.cfg

@@ -151,7 +151,7 @@ netaddr = 0.7.6
 
 # Required by:
 # slapos.core==0.24
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.23

stack/lamp/buildout.cfg

@@ -352,7 +352,7 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.34.0

stack/lapp/buildout.cfg

@@ -360,7 +360,7 @@ netaddr = 0.7.10
 
 # Required by:
 # slapos.core==0.35.1
-netifaces = 0.10.3
+netifaces = 0.10.4
 
 # Required by:
 # slapos.toolbox==0.33.1

stack/monitor/buildout.cfg

@@ -10,7 +10,6 @@ extends =
 parts =
   slapos-cookbook
   dcron
-  download-static-files
   monitor-eggs
   extra-eggs
   monitor-bin
@@ -42,54 +41,72 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/monitor.cfg.in
 output = ${buildout:directory}/monitor.cfg
 filename = monitor.cfg
-md5sum = bd592a0f0c41ec15c643c4e91e9ec5cc
+md5sum = 0fe5b78cd16df190ec8838116954669e
 mode = 0644
 
 [monitor-bin]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
-md5sum = 1e7b4698f6627150b1eb783b06f8b13a
+md5sum = cb2f15850d3dc82459a0044adb4416cf
 destination = ${buildout:directory}/parts/monitor-template-monitor-bin
 filename = monitor.py.in
 mode = 0644
 
 [index]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfiles/${:filename}
+url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
-md5sum = 91ac749f86aecc0c383d93e51e15a572
+md5sum = af1adc107b73290afb98d011f7307de1
 destination = ${buildout:directory}/parts/monitor-index
 filename = index.cgi.in
 mode = 0644
 
 [index-template]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfiles/${:filename}
+url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
 destination = ${buildout:directory}/parts/monitor-template-index
-md5sum = e0d2aaeffc046b2ac6d9d717e1ba321d
+md5sum = 05051a2ff81ce7dc2eef3106d75b33f9
 filename = index.html.jinja2
 mode = 0644
 
 [status-cgi]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfiles/${:filename}
+url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
-md5sum = aa2764cab87e457410435974f729e906
+md5sum = e43d79bec8824265e22df7960744113a
 destination = ${buildout:directory}/parts/monitor-template-status-cgi
 filename = status.cgi.in
 mode = 0644
 
+[status-history-cgi]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/webfile-directory/${:filename}
+download-only = true
+md5sum = fa8ec5aa5395b1bc6b9c7e898d6c5ec5
+destination = ${buildout:directory}/parts/monitor-template-status-history-cgi
+filename = status-history.cgi.in
+mode = 0644
+
 [settings-cgi]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfiles/${:filename}
+url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
-md5sum = 18574b804da0c65d8670959f9e7c4774
+md5sum = b4cef123a3273e848e8fe496e22b20a8
 destination = ${buildout:directory}/parts/monitor-template-settings-cgi
 filename = settings.cgi.in
 mode = 0644
 
+[monitor-password-cgi]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/webfile-directory/${:filename}
+download-only = true
+md5sum = c7ba7ecb09d0d1d24e7cb73a212cc33f
+destination = ${buildout:directory}/parts/monitor-template-monitor-password-cgi
+filename = monitor-password.cgi.in
+mode = 0644
+
 [rss-bin]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -106,11 +123,20 @@ output = $${directory:services}/crond
 mode = 0700
 logfile = $${directory:log}/crond.log
 
-[download-static-files]
+[download-monitor-static]
 recipe = hexagonit.recipe.download
-url = https://github.com/SlapOS/staticForMonitoring/blob/db670e7568871c69a64916d462ccb57629f1c77d/static-files.tar.gz?raw=true
-download-only = true
-md5sum = 9e3feb2b520620d5b8d478eb9a9be6de
-filename = static-files.tar.gz
+url = http://git.erp5.org/gitweb/slapos.git/snapshot/930be99041ea26b7b1186830e5eb56ef0acc1bdf.tar.gz
+download-only = false
+filename = monitor-static.tar.gz
 destination = ${buildout:directory}/parts/monitor-static-files
+ignore-existing = true
+strip-top-level-dir = true
+mode = 0644
+
+[download-monitor-jquery]
+recipe = hexagonit.recipe.download
+url = http://code.jquery.com/jquery-1.10.2.min.js
+download-only = true
+destination = ${download-monitor-static:destination}
+filename = jquery-1.10.2.min.js
 mode = 0644

stack/monitor/monitor.cfg.in

@@ -18,6 +18,7 @@ url = https://[$${slap-parameters:ipv6-random}]:$${:port}
 index-filename = index.cgi
 index-path = $${monitor-directory:www}/$${:index-filename}
 db-path = $${monitor-directory:etc}/monitor.db
+monitor-password-path = $${monitor-directory:etc}/.monitor.shadow
 
 [monitor-directory]
 recipe = slapos.cookbook:mkdirectory
@@ -86,24 +87,24 @@ frequency = */5 * * * *
 command = $${make-rss:rendered}
 
 [setup-static-files]
-recipe = hexagonit.recipe.download
-url = ${download-static-files:destination}/${download-static-files:filename}
-filename = static
-destination = $${monitor-directory:www}
-ignore-existing = true
-mode = 0644
+recipe = plone.recipe.command
+command = ln -s ${download-monitor-jquery:destination} $${monitor-directory:www}/static
+update-command = $${:command}
 
 [deploy-index]
 recipe = slapos.recipe.template:jinja2
 template = ${index:location}/${index:filename}
 rendered = $${monitor-parameters:index-path}
+update-apache-access = ${apache:location}/bin/htpasswd -cb $${monitor-parameters:htaccess-file} admin
 mode = 0744
 context =
   key cgi_directory monitor-directory:cgi-bin
   raw index_template $${deploy-index-template:location}/$${deploy-index-template:filename}
-  key password zero-parameters:monitor-password
+  key monitor_password_path monitor-parameters:monitor-password-path
+  key monitor_password_script_path deploy-monitor-password-cgi:rendered
+  key apache_update_command :update-apache-access
   raw extra_eggs_interpreter ${buildout:directory}/bin/${extra-eggs:interpreter}
-  raw default_page /welcome.html
+  raw default_page /static/welcome.html
 
 [deploy-index-template]
 recipe = hexagonit.recipe.download
@@ -126,6 +127,17 @@ context =
   key this_file :filename
   raw python_executable ${buildout:executable}
 
+[deploy-status-history-cgi]
+recipe = slapos.recipe.template:jinja2
+template = ${status-history-cgi:location}/${status-history-cgi:filename}
+rendered = $${monitor-directory:monitoring-cgi}/$${:filename}
+filename = status-history.cgi
+mode = 0744
+context =
+  key monitor_db_path monitor-parameters:db-path
+  key status_history_length zero-parameters:status-history-length
+  raw python_executable ${buildout:executable}
+
 [deploy-settings-cgi]
 recipe = slapos.recipe.template:jinja2
 template = ${settings-cgi:location}/${settings-cgi:filename}
@@ -139,6 +151,17 @@ context =
   key pwd monitor-directory:knowledge0-cgi
   key this_file :filename
 
+[deploy-monitor-password-cgi]
+recipe = slapos.recipe.template:jinja2
+template = ${monitor-password-cgi:location}/${monitor-password-cgi:filename}
+rendered = $${monitor-directory:knowledge0-cgi}/$${:filename}
+filename = monitor-password.cgi
+mode = 0744
+context =
+  raw python_executable ${buildout:executable}
+  key pwd monitor-directory:knowledge0-cgi
+  key this_file :filename
+
 [deploy-monitor-script]
 recipe = slapos.recipe.template:jinja2
 template = ${monitor-bin:location}/${monitor-bin:filename}
@@ -159,12 +182,6 @@ context =
   section directory monitor-directory
   section monitor_parameters monitor-parameters
 
-[monitor-htaccess]
-recipe = plone.recipe.command
-stop-on-error = true
-htaccess-path = $${monitor-parameters:htaccess-file}
-command = ${apache:location}/bin/htpasswd -cb $${:htaccess-path} admin $${zero-parameters:monitor-password}
-
 [monitor-directory-access]
 recipe = plone.recipe.command
 command = ln -s $${:source} $${monitor-directory:private-directory}
@@ -211,7 +228,7 @@ name = example.com
 [public]
 recipe = slapos.cookbook:zero-knowledge.write
 filename = knowledge0.cfg
-monitor-password = passwordtochange
+status-history-length = 5
 
 [zero-parameters]
 recipe = slapos.cookbook:zero-knowledge.read
@@ -279,7 +296,7 @@ input = inline:
   </Files>
   AuthType Basic
   AuthName "Private access"
-  AuthUserFile "$${monitor-htaccess:htaccess-path}"
+  AuthUserFile "$${monitor-parameters:htaccess-file}"
   Require valid-user
   Options Indexes FollowSymLinks
   Satisfy all
@@ -315,4 +332,3 @@ curl_path = ${curl:location}/bin/curl
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
 monitor_url = $${monitor-parameters:url}
-IMPORTANT_monitor_info = Change the monitor_password as soon as possible ! Default is : $${public:monitor-password} . You can change it in the setting.cgi section of your monitorin interface

stack/monitor/monitor.py.in

@@ -7,6 +7,7 @@ import subprocess
 import sys
 import sqlite3
 import time
+import threading
 from optparse import OptionParser, make_option
 
 
@@ -34,6 +35,26 @@ option_list = [
               help="add the file containing services\'pid to the files to monitor")
 ]
 
+class Popen(subprocess.Popen):
+  __timeout = None
+
+  def timeout(self, delay, delay_before_kill=5):
+    if self.__timeout is not None: self.__timeout.cancel()
+    self.__timeout = threading.Timer(delay, self.stop, [delay_before_kill])
+    self.__timeout.start()
+    def waiter():
+        self.wait()
+        self.__timeout.cancel()
+    threading.Thread(target=waiter).start()
+
+  def stop(self, delay_before_kill=5):
+    if self.__timeout is not None: self.__timeout.cancel()
+    self.terminate()
+    t = threading.Timer(delay_before_kill, self.kill)
+    t.start()
+    r = self.wait()
+    t.cancel()
+    return r
 
 def init_db():
   db = sqlite3.connect(db_path)
@@ -89,24 +110,26 @@ def runServices(directory):
 
 def runScripts(directory):
   scripts = getListOfScripts(directory)
-  script_timeout = 3
+  # XXX script_timeout could be passed as parameters
+  script_timeout = 60 # in seconds
   result = {}
   for script in scripts:
     command = [os.path.join(promise_dir, script)]
     script = os.path.basename(command[0])
     result[script] = ''
 
-    process_handler = subprocess.Popen(command,
-                                       cwd=instance_path,
-                                       env=None if sys.platform == 'cygwin' else {},
-                                       stdout=subprocess.PIPE,
-                                       stderr=subprocess.PIPE,
-                                       stdin=subprocess.PIPE)
+    process_handler = Popen(command,
+                            cwd=instance_path,
+                            env=None if sys.platform == 'cygwin' else {},
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE,
+                            stdin=subprocess.PIPE)
     process_handler.stdin.flush()
     process_handler.stdin.close()
     process_handler.stdin = None
 
-    time.sleep(script_timeout)
+    process_handler.timeout(script_timeout)
+    process_handler.wait()
 
     if process_handler.poll() is None:
       process_handler.terminate()

stack/monitor/webfiles/index.cgi.in → stack/monitor/webfile-directory/index.cgi.in

@@ -3,11 +3,12 @@
 import cgi
 import cgitb
 import Cookie
+import base64
+import hashlib
+import hmac
 import jinja2
-import json
 import os
 import subprocess
-import sys
 import urllib
 
 cgitb.enable(display=0, logdir="/tmp/cgi.log")
@@ -17,6 +18,58 @@ cookie = Cookie.SimpleCookie()
 
 cgi_path = "{{ cgi_directory }}"
 
+monitor_password_path = "{{ monitor_password_path }}"
+monitor_password_script_path = "{{ monitor_password_script_path }}"
+
+monitor_apache_password_command = "{{ apache_update_command }}"
+
+########
+# Password functions
+#######
+def crypt(word, salt="$$"):
+  salt = salt.split("$")
+  algo = salt[0] or 'sha1'
+  if algo in hashlib.algorithms:
+    H = getattr(hashlib, algo)
+  elif algo == "plain":
+    return "%s$%s" % (algo, word)
+  else:
+    raise ValueError
+  rounds = min(max(0, int(salt[1])), 30) if salt[1] else 9
+  salt = salt[2] or base64.b64encode(os.urandom(12), "./")
+  h = hmac.new(salt, word, H).digest()
+  for x in xrange(1, 1 << rounds):
+    h = H(h).digest()
+  return "%s$%s$%s$%s" % (algo, rounds, salt,
+    base64.b64encode(h, "./").rstrip("="))
+
+def is_password_set():
+  if not os.path.exists(monitor_password_path):
+    return False
+  hashed_password = open(monitor_password_path, 'r').read()
+  try:
+    void, algo, salt, hsh = hashed_password.split('$')
+  except ValueError:
+    return False
+  return True
+
+def set_password(raw_password):
+  hashed_password = crypt(raw_password)
+  subprocess.check_call(monitor_apache_password_command + " %s" % raw_password,
+                        shell=True)
+  open(monitor_password_path, 'w').write(hashed_password)
+
+
+def check_password(raw_password):
+  """
+  Returns a boolean of whether the raw_password was correct. Handles
+  encryption formats behind the scenes.
+  """
+  if not os.path.exists(monitor_password_path) or not raw_password:
+    return False
+  hashed_password = open(monitor_password_path, 'r').read()
+  return hashed_password == crypt(raw_password, hashed_password)
+### End of password functions
 
 def forward_form():
   command = os.path.join(cgi_path, form['posting-script'].value)
@@ -33,8 +86,10 @@ def forward_form():
     pass
 
 
-def return_document():
-  command = os.path.join(cgi_path, form['script'].value)
+def return_document(command=None):
+  if not command:
+    script = form['script'].value
+    command = os.path.join(cgi_path, script)
   #XXX this functions should be called only for display,
   #so a priori it doesn't need form data
   os.environ['QUERY_STRING'] = ''
@@ -45,8 +100,8 @@ def return_document():
       print open(command).read()
     else:
       raise OSError
-  except (subprocess.CalledProcessError, OSError):
-    print "<p>File cannot be found</p>"
+  except (subprocess.CalledProcessError, OSError) as e:
+    print "<p>Error :</p><pre>%s</pre>" % e
 
 
 def make_menu():
@@ -62,33 +117,52 @@ def make_menu():
   return folder_list
 
 
-# Beginning of response
-print "Content-Type: text/html"
-
-# Check if user is logged
-if "password" in form:
-  password = form['password'].value
-  if password == '{{ password }}' :
-    cookie['password'] = password
-    print cookie, "; Path=/; HttpOnly"
-else:
+def get_cookie_password():
   cookie_string = os.environ.get('HTTP_COOKIE')
   if cookie_string:
     cookie.load(cookie_string)
     try:
-      password = cookie['password'].value
+      return cookie['password'].value
     except KeyError:
-      password = None
-  else:
-    password = None
+      pass
+  return None
+
+def set_cookie_password(password):
+  cookie['password'] = password
+  print cookie, "; Path=/; HttpOnly"
 
+
+# Beginning of response
+print "Content-Type: text/html"
+
+password = None
+
+# Check if user is logged
+if "password_2" in form and "password" in form:
+  password_2 = form['password_2'].value
+  password_1 = form['password'].value
+  password = get_cookie_password()
+  if not is_password_set() or check_password(password):
+    if password_2 == password_1:
+      password = password_1
+      set_password(password)
+      set_cookie_password(password)
+elif "password" in form:
+  password = form['password'].value
+  if is_password_set() and check_password(password):
+    set_cookie_password(password)
+else:
+  password = get_cookie_password()
 print '\n'
 
-if not password or password != '{{ password }}':
+
+if not is_password_set():
+  return_document(monitor_password_script_path)
+elif not check_password(password):
   print "<html><head>"
   print """
-    <link rel="stylesheet" href="pure-min.css">
-    <link rel="stylesheet" href="/style.css">"""
+    <link rel="stylesheet" href="static/pure-min.css">
+    <link rel="stylesheet" href="static/style.css">"""
   print "</head><body>"
   if password is None:
     print "<h1>This is the monitoring interface</h1>"
@@ -101,7 +175,6 @@ if not password or password != '{{ password }}':
     <button type="submit" class="pure-button pure-button-primary">Access</button>
   </form>
   </body></html>"""
-
 # redirection to the required script/page
 else:
   print

stack/monitor/webfiles/index.html.jinja2 → stack/monitor/webfile-directory/index.html.jinja2

 <html>
 <head>
  <title>Monitoring Interface</title>
- <link rel="stylesheet" href="pure-min.css">
- <link rel="stylesheet" href="/style.css">
- <script src="jquery-1.10.2.min.js"></script>
- <script src="script.js"></script>
+ <link rel="stylesheet" href="static/pure-min.css">
+ <link rel="stylesheet" href="static/style.css">
+ <script src="static/jquery-1.10.2.min.js"></script>
+ <script src="static/script.js"></script>
 </head>
 <body>
  <div id="div-menu">

stack/monitor/webfile-directory/monitor-password.cgi.in

+#!{{ python_executable }}
+
+import cgitb
+
+cgitb.enable()
+
+print "<html><head>"
+print """
+  <script type="text/javascript" src="static/jquery-1.10.2.min.js"></script>
+  <link rel="stylesheet" href="static/pure-min.css">
+  <link rel="stylesheet" href="static/style.css">"""
+print "</head><body>"
+print "<h1>This is the monitoring interface</h1>"
+print "<h2>Please set your password for later access</h2>"
+print """
+<form action="/index.cgi" method="post" class="pure-form-aligned">
+<div class="pure-control-group">
+<label for="password">Password*:</label>
+<input placeholder="Set your password" type="password" name="password" id="password"></br>
+</div><div class="pure-control-group">
+<label for="password">Verify Password*:</label>
+<input placeholder="Verify password" type="password" name="password_2" id="password_2"></br>
+</div><p id="validate-status" style="color:red"></p>
+<div class="pure-controls">
+<button id="register-button" type="submit" class="pure-button pure-button-primary" disabled>Access</button></div>
+</form>
+<script type="text/javascript" src="static/monitor-register.js"></script>
+</body></html>
+"""

stack/monitor/webfiles/settings.cgi.in → stack/monitor/webfile-directory/settings.cgi.in

@@ -9,22 +9,27 @@ cgitb.enable()
 form = cgi.FieldStorage()
 
 print "<html><head>"
-print "<link rel=\"stylesheet\" href=\"pure-min.css\">"
-print "<link rel=\"stylesheet\" href=\"/style.css\">"
+print "<link rel=\"stylesheet\" href=\"static/pure-min.css\">"
+print "<link rel=\"stylesheet\" href=\"static/style.css\">"
 print "</head><body>"
 
 config_file = "{{ config_cfg }}"
 
 if not os.path.exists(config_file):
   print "Your software does <b>not</b> embed 0-knowledge. \
-  This interface is useless in this case"
+  This interface is useless in this case</body></html>"
   exit(0)
 
 parser = ConfigParser.ConfigParser()
 parser.read(config_file)
 
+if not parser.has_section('public'):
+  print "<p>Your software does not use 0-knowledge settings.</p></body></html>"
+  exit(0)
+
 for name in form:
-  parser.set('public', name, form[name].value)
+  if parser.has_option('public', name):
+    parser.set('public', name, form[name].value)
 with open(config_file, 'w') as file:
   parser.write(file)
 
@@ -39,8 +44,8 @@ print "<form action=\"/index.cgi\" method=\"post\" class=\"pure-form-aligned\">"
 print "<input type=\"hidden\" name=\"posting-script\" value=\"{{ pwd }}/{{ this_file }}\">"
 for option in parser.options("public"):
   print "<div class=\"pure-control-group\">"
-  print "<label for=\"%s\">%s</label>"%(option, option)
-  print "<input type=\"text\" name=\"%s\" value=\"%s\">"%(option, parser.get('public', option))
+  print "<label for=\"%s\">%s</label>" % (cgi.escape(option, quote=True), cgi.escape(option))
+  print "<input type=\"text\" name=\"%s\" value=\"%s\">" % (cgi.escape(option, quote=True), cgi.escape(parser.get('public', option), quote=True))
   print "</div>"
 print "<div class=\"pure-controls\"><button type=\"submit\" class=\"pure-button \
  pure-button-primary\">Save</button></div></form>"
@@ -51,8 +56,8 @@ for section in parser.sections():
   if section != 'public':
     for option in parser.options(section):
       print "<div class=\"pure-control-group\">"
-      print "<label for=\"%s\">%s</label>"%(option, option)
-      print "<input type=\"text\" name=\"%s\" value=\"%s\" readonly>"%(option, parser.get(section, option))
+      print "<label for=\"%s\">%s</label>" % (cgi.escape(option, quote=True), cgi.escape(option))
+      print "<input type=\"text\" name=\"%s\" value=\"%s\" readonly>" %(cgi.escape(option, quote=True), cgi.escape(parser.get(section, option), quote=True))
       print "</div>"
 print "</form>"
 

stack/monitor/webfile-directory/static/monitor-register.js

+$(window).load(function(){
+  $(document).ready(function() {
+    $("#password_2").keyup(validate);
+  });
+  function validate() {
+    var password1 = $("#password").val();
+    var password2 = $("#password_2").val();
+      if(password1 == password2) {
+          $("#register-button").removeAttr("disabled");
+          $("#validate-status").attr("style", "display:none");
+      }
+      else {
+          $("#register-button").attr("disabled", "disabled");
+          $("#validate-status").attr("style", "").text("Passwords do not match");
+      }   
+  }
+});
\ No newline at end of file

stack/monitor/webfile-directory/static/pure-min.css

+/*!
+Pure v0.3.0
+Copyright 2013 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+https://github.com/yui/pure/blob/master/LICENSE.md
+*/
+/*!
+normalize.css v1.1.2 | MIT License | git.io/normalize
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+*/
+/*! normalize.css v1.1.2 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-size:100%;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}html,button,input,select,textarea{font-family:sans-serif}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}h2{font-size:1.5em;margin:.83em 0}h3{font-size:1.17em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:1em 40px}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace,serif;_font-family:'courier new',monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ul,nav ol{list-style:none;list-style-image:none}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}.pure-button{display:inline-block;*display:inline;zoom:1;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button{font-size:100%;*font-size:90%;*overflow:visible;padding:.5em 1.5em;color:#444;color:rgba(0,0,0,.8);*color:#444;border:1px solid #999;border:0 rgba(0,0,0,0);background-color:#E6E6E6;text-decoration:none;border-radius:2px;-webkit-transition:.1s linear -webkit-box-shadow;-moz-transition:.1s linear -moz-box-shadow;-ms-transition:.1s linear box-shadow;-o-transition:.1s linear box-shadow;transition:.1s linear box-shadow}.pure-button-hover,.pure-button:hover,.pure-button:focus{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#1a000000', GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.1)));background-image:-webkit-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1));background-image:-moz-linear-gradient(top,rgba(0,0,0,.05) 0,rgba(0,0,0,.1));background-image:-ms-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1));background-image:-o-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button:focus{outline:0}.pure-button-active,.pure-button:active{box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset}.pure-button[disabled],.pure-button-disabled,.pure-button-disabled:hover,.pure-button-disabled:focus,.pure-button-disabled:active{border:0;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);filter:alpha(opacity=40);-khtml-opacity:.4;-moz-opacity:.4;opacity:.4;cursor:not-allowed;box-shadow:none}.pure-button-hidden{display:none}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-primary,.pure-button-selected,a.pure-button-primary,a.pure-button-selected{background-color:#0078e7;color:#fff}.pure-form input[type=text],.pure-form input[type=password],.pure-form input[type=email],.pure-form input[type=url],.pure-form input[type=date],.pure-form input[type=month],.pure-form input[type=time],.pure-form input[type=datetime],.pure-form input[type=datetime-local],.pure-form input[type=week],.pure-form input[type=number],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=color],.pure-form select,.pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;font-size:.8em;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;-webkit-transition:.3s linear border;-moz-transition:.3s linear border;-ms-transition:.3s linear border;-o-transition:.3s linear border;transition:.3s linear border;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.pure-form input[type=text]:focus,.pure-form input[type=password]:focus,.pure-form input[type=email]:focus,.pure-form input[type=url]:focus,.pure-form input[type=date]:focus,.pure-form input[type=month]:focus,.pure-form input[type=time]:focus,.pure-form input[type=datetime]:focus,.pure-form input[type=datetime-local]:focus,.pure-form input[type=week]:focus,.pure-form input[type=number]:focus,.pure-form input[type=search]:focus,.pure-form input[type=tel]:focus,.pure-form input[type=color]:focus,.pure-form select:focus,.pure-form textarea:focus{outline:0;outline:thin dotted \9;border-color:#129FEA}.pure-form input[type=file]:focus,.pure-form input[type=radio]:focus,.pure-form input[type=checkbox]:focus{outline:thin dotted #333;outline:1px auto #129FEA}.pure-form .pure-checkbox,.pure-form .pure-radio{margin:.5em 0;display:block}.pure-form input[type=text][disabled],.pure-form input[type=password][disabled],.pure-form input[type=email][disabled],.pure-form input[type=url][disabled],.pure-form input[type=date][disabled],.pure-form input[type=month][disabled],.pure-form input[type=time][disabled],.pure-form input[type=datetime][disabled],.pure-form input[type=datetime-local][disabled],.pure-form input[type=week][disabled],.pure-form input[type=number][disabled],.pure-form input[type=search][disabled],.pure-form input[type=tel][disabled],.pure-form input[type=color][disabled],.pure-form select[disabled],.pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input[readonly],.pure-form select[readonly],.pure-form textarea[readonly]{background:#eee;color:#777;border-color:#ccc}.pure-form input:focus:invalid,.pure-form textarea:focus:invalid,.pure-form select:focus:invalid{color:#b94a48;border:1px solid #ee5f5b}.pure-form input:focus:invalid:focus,.pure-form textarea:focus:invalid:focus,.pure-form select:focus:invalid:focus{border-color:#e9322d}.pure-form input[type=file]:focus:invalid:focus,.pure-form input[type=radio]:focus:invalid:focus,.pure-form input[type=checkbox]:focus:invalid:focus{outline-color:#e9322d}.pure-form select{border:1px solid #ccc;background-color:#fff}.pure-form select[multiple]{height:auto}.pure-form label{margin:.5em 0 .2em;font-size:90%}.pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}.pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;font-size:125%;color:#333;border-bottom:1px solid #e5e5e5}.pure-form-stacked input[type=text],.pure-form-stacked input[type=password],.pure-form-stacked input[type=email],.pure-form-stacked input[type=url],.pure-form-stacked input[type=date],.pure-form-stacked input[type=month],.pure-form-stacked input[type=time],.pure-form-stacked input[type=datetime],.pure-form-stacked input[type=datetime-local],.pure-form-stacked input[type=week],.pure-form-stacked input[type=number],.pure-form-stacked input[type=search],.pure-form-stacked input[type=tel],.pure-form-stacked input[type=color],.pure-form-stacked select,.pure-form-stacked label,.pure-form-stacked textarea{display:block;margin:.25em 0}.pure-form-aligned input,.pure-form-aligned textarea,.pure-form-aligned select,.pure-form-aligned .pure-help-inline,.pure-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.pure-form-aligned .pure-control-group{margin-bottom:.5em}.pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}.pure-form-aligned .pure-controls{margin:1.5em 0 0 10em}.pure-form input.pure-input-rounded,.pure-form .pure-input-rounded{border-radius:2em;padding:.5em 1em}.pure-form .pure-group fieldset{margin-bottom:10px}.pure-form .pure-group input{display:block;padding:10px;margin:0;border-radius:0;position:relative;top:-1px}.pure-form .pure-group input:focus{z-index:2}.pure-form .pure-group input:first-child{top:1px;border-radius:4px 4px 0 0}.pure-form .pure-group input:last-child{top:-2px;border-radius:0 0 4px 4px}.pure-form .pure-group button{margin:.35em 0}.pure-form .pure-input-1{width:100%}.pure-form .pure-input-2-3{width:66%}.pure-form .pure-input-1-2{width:50%}.pure-form .pure-input-1-3{width:33%}.pure-form .pure-input-1-4{width:25%}.pure-form .pure-help-inline,.pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:90%}.pure-form-message{display:block;color:#666;font-size:90%}@media only screen and (max-width :480px){.pure-form button[type=submit]{margin:.7em 0 0}.pure-form input[type=text],.pure-form input[type=password],.pure-form input[type=email],.pure-form input[type=url],.pure-form input[type=date],.pure-form input[type=month],.pure-form input[type=time],.pure-form input[type=datetime],.pure-form input[type=datetime-local],.pure-form input[type=week],.pure-form input[type=number],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=color],.pure-form label{margin-bottom:.3em;display:block}.pure-group input[type=text],.pure-group input[type=password],.pure-group input[type=email],.pure-group input[type=url],.pure-group input[type=date],.pure-group input[type=month],.pure-group input[type=time],.pure-group input[type=datetime],.pure-group input[type=datetime-local],.pure-group input[type=week],.pure-group input[type=number],.pure-group input[type=search],.pure-group input[type=tel],.pure-group input[type=color]{margin-bottom:0}.pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.pure-form-aligned .pure-controls{margin:1.5em 0 0}.pure-form .pure-help-inline,.pure-form-message-inline,.pure-form-message{display:block;font-size:80%;padding:.2em 0 .8em}}.pure-g{letter-spacing:-.31em;*letter-spacing:normal;*word-spacing:-.43em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-flex;-webkit-flex-flow:row wrap;display:-ms-flexbox;-ms-flex-flow:row wrap}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-g [class *="pure-u"]{font-family:sans-serif}.pure-u-1,.pure-u-1-2,.pure-u-1-3,.pure-u-2-3,.pure-u-1-4,.pure-u-3-4,.pure-u-1-5,.pure-u-2-5,.pure-u-3-5,.pure-u-4-5,.pure-u-1-6,.pure-u-5-6,.pure-u-1-8,.pure-u-3-8,.pure-u-5-8,.pure-u-7-8,.pure-u-1-12,.pure-u-5-12,.pure-u-7-12,.pure-u-11-12,.pure-u-1-24,.pure-u-5-24,.pure-u-7-24,.pure-u-11-24,.pure-u-13-24,.pure-u-17-24,.pure-u-19-24,.pure-u-23-24{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-u-1{width:100%}.pure-u-1-2{width:50%;*width:49.969%}.pure-u-1-3{width:33.3333%;*width:33.3023%}.pure-u-2-3{width:66.6667%;*width:66.6357%}.pure-u-1-4{width:25%;*width:24.969%}.pure-u-3-4{width:75%;*width:74.969%}.pure-u-1-5{width:20%;*width:19.969%}.pure-u-2-5{width:40%;*width:39.969%}.pure-u-3-5{width:60%;*width:59.969%}.pure-u-4-5{width:80%;*width:79.969%}.pure-u-1-6{width:16.6667%;*width:16.6357%}.pure-u-5-6{width:83.3333%;*width:83.3023%}.pure-u-1-8{width:12.5%;*width:12.469%}.pure-u-3-8{width:37.5%;*width:37.469%}.pure-u-5-8{width:62.5%;*width:62.469%}.pure-u-7-8{width:87.5%;*width:87.469%}.pure-u-1-12{width:8.3333%;*width:8.3023%}.pure-u-5-12{width:41.6667%;*width:41.6357%}.pure-u-7-12{width:58.3333%;*width:58.3023%}.pure-u-11-12{width:91.6667%;*width:91.6357%}.pure-u-1-24{width:4.1667%;*width:4.1357%}.pure-u-5-24{width:20.8333%;*width:20.8023%}.pure-u-7-24{width:29.1667%;*width:29.1357%}.pure-u-11-24{width:45.8333%;*width:45.8023%}.pure-u-13-24{width:54.1667%;*width:54.1357%}.pure-u-17-24{width:70.8333%;*width:70.8023%}.pure-u-19-24{width:79.1667%;*width:79.1357%}.pure-u-23-24{width:95.8333%;*width:95.8023%}.pure-g-r{letter-spacing:-.31em;*letter-spacing:normal;*word-spacing:-.43em;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-flex;-webkit-flex-flow:row wrap;display:-ms-flexbox;-ms-flex-flow:row wrap}.opera-only :-o-prefocus,.pure-g-r{word-spacing:-.43em}.pure-g-r [class *="pure-u"]{font-family:sans-serif}.pure-g-r img{max-width:100%;height:auto}@media (min-width:980px){.pure-visible-phone{display:none}.pure-visible-tablet{display:none}.pure-hidden-desktop{display:none}}@media (max-width:480px){.pure-g-r>.pure-u,.pure-g-r>[class *="pure-u-"]{width:100%}}@media (max-width:767px){.pure-g-r>.pure-u,.pure-g-r>[class *="pure-u-"]{width:100%}.pure-hidden-phone{display:none}.pure-visible-desktop{display:none}}@media (min-width:768px) and (max-width:979px){.pure-hidden-tablet{display:none}.pure-visible-desktop{display:none}}.pure-menu ul{position:absolute;visibility:hidden}.pure-menu.pure-menu-open{visibility:visible;z-index:2;width:100%}.pure-menu ul{left:-10000px;list-style:none;margin:0;padding:0;top:-10000px;z-index:1}.pure-menu>ul{position:relative}.pure-menu-open>ul{left:0;top:0;visibility:visible}.pure-menu-open>ul:focus{outline:0}.pure-menu li{position:relative}.pure-menu a,.pure-menu .pure-menu-heading{display:block;color:inherit;line-height:1.5em;padding:5px 20px;text-decoration:none;white-space:nowrap}.pure-menu.pure-menu-horizontal>.pure-menu-heading{display:inline-block;*display:inline;zoom:1;margin:0;vertical-align:middle}.pure-menu.pure-menu-horizontal>ul{display:inline-block;*display:inline;zoom:1;vertical-align:middle;height:2.4em}.pure-menu li a{padding:5px 20px}.pure-menu-can-have-children>.pure-menu-label:after{content:'\25B8';float:right;font-family:'Lucida Grande','Lucida Sans Unicode','DejaVu Sans',sans-serif;margin-right:-20px;margin-top:-1px}.pure-menu-can-have-children>.pure-menu-label{padding-right:30px}.pure-menu-separator{background-color:#dfdfdf;display:block;height:1px;font-size:0;margin:7px 2px;overflow:hidden}.pure-menu-hidden{display:none}.pure-menu-fixed{position:fixed;top:0;left:0;width:100%}.pure-menu-horizontal li{display:inline-block;*display:inline;zoom:1;vertical-align:middle}.pure-menu-horizontal li li{display:block}.pure-menu-horizontal>.pure-menu-children>.pure-menu-can-have-children>.pure-menu-label:after{content:"\25BE"}.pure-menu-horizontal>.pure-menu-children>.pure-menu-can-have-children>.pure-menu-label{padding-right:30px}.pure-menu-horizontal li.pure-menu-separator{height:50%;width:1px;margin:0 7px}.pure-menu-horizontal li li.pure-menu-separator{height:1px;width:auto;margin:7px 2px}.pure-menu.pure-menu-open,.pure-menu.pure-menu-horizontal li .pure-menu-children{background:#fff;border:1px solid #b7b7b7}.pure-menu.pure-menu-horizontal,.pure-menu.pure-menu-horizontal .pure-menu-heading{border:0}.pure-menu a{border:1px solid transparent;border-left:0;border-right:0}.pure-menu a,.pure-menu .pure-menu-can-have-children>li:after{color:#777}.pure-menu .pure-menu-can-have-children>li:hover:after{color:#fff}.pure-menu .pure-menu-open{background:#dedede}.pure-menu li a:hover,.pure-menu li a:focus{background:#eee}.pure-menu li.pure-menu-disabled a:hover,.pure-menu li.pure-menu-disabled a:focus{background:#fff;color:#bfbfbf}.pure-menu .pure-menu-disabled>a{background-image:none;border-color:transparent;cursor:default}.pure-menu .pure-menu-disabled>a,.pure-menu .pure-menu-can-have-children.pure-menu-disabled>a:after{color:#bfbfbf}.pure-menu .pure-menu-heading{color:#565d64;text-transform:uppercase;font-size:90%;margin-top:.5em;border-bottom-width:1px;border-bottom-style:solid;border-bottom-color:#dfdfdf}.pure-menu .pure-menu-selected a{color:#000}.pure-menu.pure-menu-open.pure-menu-fixed{border:0;border-bottom:1px solid #b7b7b7}.pure-paginator{letter-spacing:-.31em;*letter-spacing:normal;*word-spacing:-.43em;text-rendering:optimizespeed;list-style:none;margin:0;padding:0}.opera-only :-o-prefocus,.pure-paginator{word-spacing:-.43em}.pure-paginator li{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-paginator .pure-button{border-radius:0;padding:.8em 1.4em;vertical-align:top;height:1.1em}.pure-paginator .pure-button:focus,.pure-paginator .pure-button:active{outline-style:none}.pure-paginator .prev,.pure-paginator .next{color:#C0C1C3;text-shadow:0 -1px 0 rgba(0,0,0,.45)}.pure-paginator .prev{border-radius:2px 0 0 2px}.pure-paginator .next{border-radius:0 2px 2px 0}@media (max-width:480px){.pure-menu-horizontal{width:100%}.pure-menu-children li{display:block;border-bottom:1px solid #000}}.pure-table{border-collapse:collapse;border-spacing:0;empty-cells:show;border:1px solid #cbcbcb}.pure-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.pure-table td,.pure-table th{border-left:1px solid #cbcbcb;border-width:0 0 0 1px;font-size:inherit;margin:0;overflow:visible;padding:6px 12px}.pure-table td:first-child,.pure-table th:first-child{border-left-width:0}.pure-table thead{background:#e0e0e0;color:#000;text-align:left;vertical-align:bottom}.pure-table td{background-color:transparent}.pure-table-odd td{background-color:#f2f2f2}.pure-table-striped tr:nth-child(2n-1) td{background-color:#f2f2f2}.pure-table-bordered td{border-bottom:1px solid #cbcbcb}.pure-table-bordered tbody>tr:last-child td,.pure-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.pure-table-horizontal td,.pure-table-horizontal th{border-width:0 0 1px;border-bottom:1px solid #cbcbcb}.pure-table-horizontal tbody>tr:last-child td{border-bottom-width:0}
\ No newline at end of file

stack/monitor/webfile-directory/static/script.js

+$(document).ready(function() {
+    function doDataUrl (data) {
+        var frame_content = document.getElementsByTagName("iframe")[0].contentWindow;
+        var b64 = btoa(data);
+        dataurl = 'data:text/html;base64,' + b64;
+        $("iframe").attr('src', dataurl);
+    }
+    
+    if ( window.self === window.top ) {
+        //not in an iframe
+        $(".script").click(function(e) {
+            e.preventDefault();
+            var message = $(this).attr('href');
+            var slash_pos = message.search('/');
+            //let's differenciate kind of script called
+            if ( slash_pos === -1 || slash_pos === 0) {
+                url = message;
+            }
+            else {
+                url = '/index.cgi';
+            }
+           
+            $("iframe").attr('src', url + '?script=' + encodeURIComponent(message));
+        });
+        $(".link").click(function(e) {
+            e.preventDefault();
+            var url = $(this).attr('href');
+            $("iframe").attr('src', url);
+        });
+    }
+    else {
+        //in an iframe
+        $("body").empty();
+    }
+});

stack/monitor/webfile-directory/static/style.css

+body {
+  padding: 15px;
+}
+
+.pure-menu .pure-menu-heading {
+  font-size: 120%;
+}
+
+#content {
+  display: inline-block;
+  min-width: 72%;
+  height: 97%;
+  margin-left: 30px;
+}
+
+#div-menu {
+  display: inline-block;
+  vertical-align: top;
+}
+
+#div-menu h1 {
+  text-align: center;
+}
+
+iframe {
+  width: 100%;
+  height: 100%;
+  margin: 0px;
+  padding: 0px;
+  border-style: none;
+}

stack/monitor/webfile-directory/static/welcome.html

+<html>
+<head>
+ <title>Welcome to the Monitoring Interface</title>
+ <link rel="stylesheet" href="pure-min.css">
+ <link rel="stylesheet" href="style.css">
+</head>
+<body>
+<h1>Welcome to your monitoring interface</h1>
+<p>From this interface you can monitor, configure your instance</p>
+</body>
+</html>

stack/monitor/webfile-directory/status-history.cgi.in

+#!{{ python_executable }}
+
+import cgi
+import datetime
+import os
+import sqlite3
+
+db_path = '{{ monitor_db_path }}'
+
+status_history_length = '{{ status_history_length }}'
+
+db = sqlite3.connect(db_path)
+
+print """<html><head>
+  <link rel="stylesheet" href="static/pure-min.css">
+  <link rel="stylesheet" href="static/style.css">
+  </head><body>
+  <h1>Monitor Status History :</h1>"""
+
+
+def get_date_from_timestamp(timestamp):
+  return datetime.datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')
+
+def print_individual_status(timestamp):
+  print "<div><h3>Failure on %s</h3><ul>" % get_date_from_timestamp(timestamp)
+  rows = db.execute("select status, element, output from individual_status where timestamp=?", (timestamp,))
+  for row in rows:
+    status, element, output = row
+    print "<li>%s , %s :</br><pre>%s</pre></li>" % (status, cgi.escape(element), cgi.escape(output))
+  print "</ul></div>"
+
+
+
+if not os.path.exists(db_path):
+  print """No status history found</p></body></html>"""
+  exit(0)
+
+failure_row_list = db.execute("select timestamp from status where status='FAILURE' order by timestamp desc limit ?", status_history_length )
+
+for failure_row in failure_row_list:
+  timestamp, = failure_row
+  print_individual_status(timestamp)
+
+print "</body></html>"

stack/monitor/webfiles/status.cgi.in → stack/monitor/webfile-directory/status.cgi.in

@@ -3,6 +3,7 @@
 import cgi
 import cgitb
 import json
+import os
 import subprocess
 
 def refresh():
@@ -11,15 +12,26 @@ def refresh():
 
 cgitb.enable(display=0, logdir="/tmp/cgi.log")
 form = cgi.FieldStorage()
-if "refresh" in form:
-  refresh()
 
 json_file = "{{ json_file }}"
+
+if not os.path.exists(json_file) or "refresh" in form:
+  refresh()
+
+if not os.path.exists(json_file):
+  print """<html><head>
+  <link rel="stylesheet" href="static/pure-min.css">
+  <link rel="stylesheet" href="static/style.css">
+  </head><body>
+  <h1>Monitoring :</h1>
+  No status file found</p></body></html>"""
+  exit(0)
+
 result = json.load(open(json_file))
 
 print "<html><head>"
-print "<link rel=\"stylesheet\" href=\"pure-min.css\">"
-print "<link rel=\"stylesheet\" href=\"/style.css\">"
+print "<link rel=\"stylesheet\" href=\"static/pure-min.css\">"
+print "<link rel=\"stylesheet\" href=\"static/style.css\">"
 print "</head><body>"
 print "<h1>Monitoring :</h1>"
 print "<form action=\"/index.cgi\" method=\"post\" class=\"pure-form-aligned\">"
@@ -33,7 +45,7 @@ print "<br/>"
 print "<h2>These scripts and promises have failed :</h2>"
 for r in result:
   if result[r] != '':
-    print "<h3>%s</h3><p style=\"padding-left:30px;\">%s</p>" % (r, result[r])
+    print "<h3>%s</h3><pre style=\"padding-left:30px;\">%s</pre>" % (cgi.escape(r), cgi.escape(result[r]))
 print "<br/>"
 
 print "<h2>These scripts and promises were successful :</h2>"