Merge branch 'slaprunner-no-cloud9'

software/slaprunner/common.cfg

@@ -2,11 +2,12 @@
 extends =
   ../../component/bash/buildout.cfg
   ../../component/busybox/buildout.cfg
-  ../../component/cloud9/buildout.cfg
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
+  ../../component/logrotate/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/nano/buildout.cfg
   ../../component/nginx/buildout.cfg
@@ -24,10 +25,6 @@ parts =
   template
   eggs
   nginx
-  simple-proxy
-  node-frontend-template
-  http-proxy
-  npm-modules
   instance-runner-import
   instance-runner-export
   slapos-cookbook
@@ -36,47 +33,6 @@ parts =
   rdiff-backup
   collective.recipe.template-egg
 
-####################
-## Node JS proxy
-####################
-[simple-proxy]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/simple-proxy.js
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-md5sum = 86e2231b3f65587b56d9be63e21a4e05
-filename = simple-proxy.js
-mode = 0644
-
-[node-frontend-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/node-frontend.in
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-filename = node-frontend.in
-md5sum = 72904152860dddb30ca936dac5bbf4cd
-mode = 0644
-
-[http-proxy]
-# https://github.com/nodejitsu/node-http-proxy
-recipe = slapos.recipe.build:download-unpacked
-#XXX-Cedric : use upstream when merged
-url = https://github.com/desaintmartin/node-http-proxy/archive/20120621.zip
-md5sum = 621e5fca448cbea137c5d847d780d84d
-
-[npm-modules]
-recipe = plone.recipe.command
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command =
-  export HOME=${:location};
-  rm -fr ${:destination} &&
-  mkdir -p ${:destination} &&
-  cd ${:destination} &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install colors@0.6.0-1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io-client@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install optimist@0.3.1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install pkginfo@0.2.3
-
 
 [template]
 recipe = slapos.recipe.template
@@ -89,27 +45,27 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 098ec22334dc6d0cd8fe747e733c86d8
+md5sum = b3288126400c4ca8469c255ef130dec9
 mode = 0644
 
 [instance-runner-import]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = 93e3c496c0955a0f7e09570bbe44e3ea
+md5sum = 82f2d0be111617eac9849cb7b8baac5d
 mode = 0644
 
 [instance-runner-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 3a69ef9a2743dbb4ab0708a7675d100c
+md5sum = 9a8cdf65bca8a562accb710a7c3b6595
 mode = 0644
 
 [template-resilient]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 932c506779cef5b20576a57d97877742
+md5sum = f8758a5a2f886d649ad02157d76550ba
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 
@@ -117,7 +73,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
 download-only = true
-md5sum = 18269f9c88f9c3bb1c2b535e44f64f56
+md5sum = b231383bb63edc0009fb6e0ff5c54d8e
 filename = instance-resilient-test.cfg.jinja2
 mode = 0644
 
@@ -125,7 +81,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/nginx_conf.in
 download-only = true
-md5sum = e169a8f217fab490ffb435d4b2d07ef3
+md5sum = 67d2ce92b4ad6dca6eaf69eeb2c2734c
 filename = nginx_conf.in
 mode = 0644
 
@@ -140,7 +96,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [slapos-cfg-template]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = 6e90b4d037ba549640345827370f8dc3
+md5sum = 8207e74c7b97a4a3f3be390ea4f97ae1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in 
 download-only = true
@@ -150,19 +106,21 @@ mode = 0644
 recipe = z3c.recipe.scripts
 eggs =
   ${lxml-python:egg}
+  collective.recipe.environment
   cns.recipe.symlink
   erp5.util
   hexagonit.recipe.download
   inotifyx
   lock-file
   netaddr
+  plone.recipe.command
+  pytz
   slapos.cookbook
   slapos.libnetworkcache
+  slapos.recipe.build
   slapos.toolbox[flask_auth]
   slapos.core
   xml_marshaller
-  pytz
-  collective.recipe.environment
   Gunicorn
 
 # Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache

software/slaprunner/instance-resilient-test.cfg.jinja2

@@ -42,14 +42,13 @@ software-url = ${slap-connection:software-release-url}
 software-type = resilient
 name = Resilient Instance (Root Instance)
 {% set cluster_parameter_dict = slapparameter_dict.get('cluster', {}) -%}
-config = resiliency-backup-periodicity frontend-domain cloud9-frontend-domain {{ cluster_parameter_dict.keys() | join(' ') }}
+config = resiliency-backup-periodicity frontend-domain {{ cluster_parameter_dict.keys() | join(' ') }}
 {% for key, value in cluster_parameter_dict.items() -%}
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}
 config-resiliency-backup-periodicity = * * * * *
 # XXX hardcoded
 config-frontend-domain = google.com
-config-cloud9-frontend-domain = google.com
 # XXX Hack to deploy Root Instance on the same computer as the type-test Instance
 sla = computer_guid
 sla-computer_guid = ${slap-connection:computer-id}

software/slaprunner/instance-resilient.cfg.jinja2

@@ -17,7 +17,7 @@ parts +=
 
 # Bubble up the parameters
 [request-runner]
-return = url ssh-public-key ssh-url notification-id ip backend_url url cloud9_url ssh_command password_recovery_code cloud9_backend_url shell_password access_url 1_info
+return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command password_recovery_code shell_password access_url 1_info
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
@@ -25,8 +25,6 @@ recipe = slapos.cookbook:publish
 backend_url = ${request-runner:connection-backend_url}
 access_url = ${request-runner:connection-access_url}
 url = ${request-runner:connection-url}
-cloud9_url = ${request-runner:connection-cloud9_url}
-cloud9_backend_url = ${request-runner:connection-cloud9_backend_url}
 ssh_command = ${request-runner:connection-ssh_command}
 password_recovery_code = ${request-runner:connection-password_recovery_code}
 shell_password = ${request-runner:connection-shell_password}

software/slaprunner/instance-runner-export.cfg.in

@@ -5,10 +5,8 @@ extends = template-runner.cfg
 parts +=
   nginx_conf
   nginx-launcher
-  cloud9
   certificate-authority
   ca-nginx
-  ca-node-frontend
   ca-shellinabox
   gunicorn-launcher
   gunicorn-graceful
@@ -19,14 +17,9 @@ parts +=
   publish-connection-informations
   slaprunner-promise
   slaprunner-frontend-promise
-  cloud9-promise
-  cloud9-frontend-promise
   dropbear-promise
   shellinabox-promise
   symlinks
-  request-cloud9-frontend
-  node-frontend-promise
-  nginx-promise
   shellinabox
   slapos-cfg
   slapos-repo-config

software/slaprunner/instance-runner-import.cfg.in

@@ -5,10 +5,8 @@ extends = template-runner.cfg
 parts +=
   nginx_conf
   nginx-launcher
-  cloud9
   certificate-authority
   ca-nginx
-  ca-node-frontend
   ca-shellinabox
   gunicorn-launcher
   gunicorn-graceful
@@ -17,13 +15,10 @@ parts +=
   dropbear-server-add-authorized-key
   sshkeys-authority
   slaprunner-promise
-  cloud9-promise
   dropbear-promise
   shellinabox-promise
-  nginx-promise
   shellinabox
   symlinks
-  nginx-promise
   slapos-cfg
   slapos-repo-config
   prepare-software

software/slaprunner/instance-runner.cfg

@@ -2,10 +2,8 @@
 parts =
   nginx_conf
   nginx-launcher
-  cloud9
   certificate-authority
   ca-nginx
-  ca-node-frontend
   ca-shellinabox
   gunicorn-launcher
   gunicorn-graceful
@@ -16,14 +14,9 @@ parts =
   publish-connection-informations
   slaprunner-promise
   slaprunner-frontend-promise
-  cloud9-promise
-  cloud9-frontend-promise
   dropbear-promise
   shellinabox-promise
   symlinks
-  request-cloud9-frontend
-  node-frontend-promise
-  nginx-promise
   shellinabox
   slapos-cfg
   slapos-repo-config
@@ -118,17 +111,6 @@ recipe = slapos.cookbook:generate.password
 storage-path = $${directory:etc}/.rcode
 bytes = 8
 
-# Deploy cloud9 and slaprunner
-[cloud9]
-recipe = slapos.cookbook:cloud9
-ip = $${slap-network-information:local-ipv4}
-port = 4443
-wrapper = $${directory:services}/cloud9
-working-directory = $${runnerdirectory:home}
-git-binary = ${git:location}/bin/git
-node-binary = ${nodejs-0.6:location}/bin/node
-cloud9 = ${cloud9:executable}
-
 [slaprunner]
 slaprunner = ${buildout:directory}/bin/slaprunner
 slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
@@ -152,7 +134,6 @@ ipv6 = $${slap-network-information:global-ipv6}
 proxy_port = 50000
 runner_port = 50005
 partition-amount = $${slap-parameter:instance-amount}
-cloud9-url = $${cloud9:access-url}
 wrapper = $${directory:services}/slaprunner
 debug = $${slap-parameter:debug}
 access-url = https://[$${:ipv6}]:$${:runner_port} 
@@ -214,33 +195,6 @@ wrapper = $${directory:services}/runner_sshd
 recipe = slapos.cookbook:dropbear.add_authorized_key
 key = $${slap-parameter:authorized-key}
 
-#---------------------
-#--
-#-- Set node frontend
-
-[node-frontend]
-launcher = $${directory:bin}/node-frontend
-ip = $${slap-network-information:global-ipv6}
-port = $${cloud9:port}
-access-url = https://[$${:ip}]:$${:port}
-
-[node-frontend-launcher]
-recipe = slapos.recipe.template:jinja2
-template = ${node-frontend-template:location}/${node-frontend-template:filename}
-rendered = $${node-frontend:launcher}
-mode = 700
-context =
-	key ip node-frontend:ip
-	key port node-frontend:port
-	key key ca-node-frontend:key-file
-	key certificate ca-node-frontend:cert-file
-	key backend_ip nginx-frontend:local-ip
-	key backend_port nginx-frontend:port
-	raw shell_path ${bash:location}/bin/bash
-	raw node_env ${buildout:parts-directory}:${npm-modules:location}/node_modules
-	raw node_path ${nodejs-0.6:location}/bin/node
-	raw conf_path ${simple-proxy:location}/${simple-proxy:filename}
-
 #---------------------------
 #--
 #-- Set nginx frontend
@@ -262,8 +216,6 @@ port = 30001
 global-ip = $${slap-network-information:global-ipv6}
 global-port = $${slaprunner:runner_port}
 # Backend
-cloud9-ip = $${cloud9:ip}
-cloud9-port = $${cloud9:port}
 runner-ip = $${slaprunner:ipv4}
 runner-port = $${slaprunner:runner_port}
 # SSL
@@ -360,16 +312,6 @@ wrapper = $${directory:services}/nginx-frontend
 # Put domain name
 name = example.com
 
-[ca-node-frontend]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${cadirectory:certs}/nodejs.key
-cert-file = $${cadirectory:certs}/nodejs.crt
-executable = $${node-frontend-launcher:rendered}
-wrapper = $${directory:services}/node-frontend
-# Put domain name
-name = example.com
-
 [ca-shellinabox]
 <= certificate-authority
 recipe = slapos.cookbook:certificate_authority.request
@@ -393,29 +335,16 @@ config-url = $${slaprunner:access-url}
 config-domain = $${slap-parameter:frontend-domain}
 return = site_url domain
 
-[request-cloud9-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Cloud9 Frontend
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config = url domain
-config-url = $${node-frontend:access-url}
-config-domain = $${slap-parameter:cloud9-frontend-domain}
-return = site_url domain
-
 #--------------------------------------
 #--
 #-- Send informations to SlapOS Master
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-1_info = On your first run, Use "access_url" to setup you account.Then you can use both "url" or "access_url". Or "backend_url" if you want to use ipv6. Moreover, you have to setup your account in slaprunner in order to access cloud9.
+1_info = On your first run, Use "access_url" to setup you account.Then you can use both "url" or "access_url". Or "backend_url" if you want to use ipv6.
 backend_url = $${slaprunner:access-url}
 access_url = $${:url}/login
 url =  https://$${request-frontend:connection-domain}
-cloud9_backend_url = $${node-frontend:access-url}
-cloud9_url = https://$${request-cloud9-frontend:connection-domain}
 ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
 shell_password = $${shellinabox:password}
 password_recovery_code = $${recovery-code:passwd}
@@ -437,33 +366,6 @@ url = https://$${request-frontend:connection-domain}/login
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
-[cloud9-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promises}/cloud9
-url = http://$${cloud9:ip}:$${cloud9:port}
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-[cloud9-frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promises}/cloud9-frontend-promise
-url = $${publish-connection-informations:cloud9_url}
-check-secure = 1
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-[node-frontend-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/node-frontend
-hostname = $${node-frontend:ip}
-port = $${node-frontend:port}
-
-[nginx-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/nginx
-hostname = $${nginx-frontend:local-ip}
-port = $${nginx-frontend:port}
-
 [dropbear-promise]
 recipe = slapos.cookbook:check_port_listening
 path = $${directory:promises}/dropbear
@@ -487,7 +389,6 @@ authorized-key =
 # Default value of instances number in slaprunner
 instance-amount = 10
 debug = false
-cloud9-frontend-domain =
 frontend-domain =
 slapos-repository = http://git.erp5.org/repos/slapos.git
 slapos-software =
@@ -520,7 +421,6 @@ context =
   key public_key slaprunner:public_key
   key private_key slaprunner:private_key
   key git slaprunner:git-binary
-  key cloud9_url slaprunner:cloud9-url
   key run_dir slaprunner:run_dir
   key log_dir slaprunner:log_dir
   key console slaprunner:console

software/slaprunner/nginx_conf.in

@@ -17,31 +17,6 @@ http {
         default upgrade;
         ''      close;
      }
-     server {
-        listen {{ param_nginx_frontend['local-ip'] }}:{{ param_nginx_frontend['port'] }};
-        server_name _;
-
-        keepalive_timeout 90s;
-        client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
-        proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};
-        fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
-        uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
-        scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
-        location / {
-            auth_basic  "Restricted";
-            auth_basic_user_file   {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
-            proxy_pass  http://{{ param_nginx_frontend['cloud9-ip'] }}:{{ param_nginx_frontend['cloud9-port'] }};
-            proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-            proxy_redirect off;
-            proxy_buffering off;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-            proxy_set_header        Host            $host;
-            proxy_set_header        X-Real-IP       $remote_addr;
-            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-    }
      server {
         listen [{{ param_nginx_frontend['global-ip'] }}]:{{ param_nginx_frontend['global-port'] }} ssl;
         server_name _;

software/slaprunner/simple-proxy.js

-/*****************************************************************************
-*
-* Copyright (c) 2013 Vifib SARL and Contributors. All Rights Reserved.
-*
-* WARNING: This program as such is intended to be used by professional
-* programmers who take the whole responsibility of assessing all potential
-* consequences resulting from its eventual inadequacies and bugs
-* End users who are looking for a ready-to-use solution with commercial
-* guarantees and support are strongly adviced to contract a Free Software
-* Service Company
-*
-* This program is Free Software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*
-*****************************************************************************/
-
-var fs = require('fs'),
-    util = require('util'),
-    colors = require('colors'),
-    http = require('http'),
-    httpProxy = require('http-proxy');
-
-
-var listenInterface = process.argv[2],
-    port = process.argv[3],
-    sslKeyFile = process.argv[4],
-    sslCertFile = process.argv[5],
-    backendIp = process.argv[6],
-    backendPort = process.argv[7];
-
-if (process.argv.length < 8) {
-  console.error("Too few arguments. Exiting.");
-  process.exit(1);
-}
-
-var middleware = function (req, res, proxy) {
-  return proxy.proxyRequest(req, res,{
-    host: backendIp,
-    port: backendPort
-  });
-};
-
-middleware.proxyWebSocketRequest = function (req, socket, head, proxy) {
-  return proxy.proxyWebSocketRequest(req, socket, head,{
-    host: backendIp,
-    port: backendPort
-  });
-};
-
-/**
- * Create server
- */
-var proxyServer = httpProxy.createServer(
-  middleware,
-  {
-    https: {
-      key: fs.readFileSync(
-        sslKeyFile,
-        'utf8'
-      ),
-      cert: fs.readFileSync(
-        sslCertFile,
-        'utf8'
-      )
-    },
-    source: {
-    host: listenInterface,
-    port: port
-  }}
-);
-
-console.log('HTTPS server starting and trying to listen on ' +
-            listenInterface + ':' + port);
-
-// Release the beast.
-proxyServer.listen(port, listenInterface);

software/slaprunner/template/slapos.cfg.in

@@ -41,4 +41,3 @@ private_key = {{ private_key }}
 git = {{ git }}
 
 [cloud9_IDE]
-cloud9 = {{ cloud9_url }}