From 529e77575dc1406165843257e271e5f33cb21878 Mon Sep 17 00:00:00 2001
From: Alain Takoudjou <talino@tiolive.com>
Date: Wed, 30 Apr 2014 17:04:32 +0200
Subject: [PATCH] fix dashboard promise, set working eggs versions

---
 software/ajaxplorer/instance-apachephp.cfg.in | 20 ++++-----
 software/ajaxplorer/software.cfg              | 44 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/software/ajaxplorer/instance-apachephp.cfg.in b/software/ajaxplorer/instance-apachephp.cfg.in
index 33ec8950..48e4b1ae 100644
--- a/software/ajaxplorer/instance-apachephp.cfg.in
+++ b/software/ajaxplorer/instance-apachephp.cfg.in
@@ -20,7 +20,7 @@ parts =
   frontend-ajaxupload-promise
   frontend-phpmyadmin-promise
 #  frontend-website-promise
-  frontend-dashboard-promise
+  url-dashboard-promise
   ajaxplorer-load-promise
 #  content-promise
 
@@ -386,12 +386,12 @@ config-custom_domain =
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-dashboard_backend = https://[$${apache-php:ip}]:$${httpd-conf:port4}
-urlweb_ipv6 = http://[$${apache-php:ip}]:$${httpd-conf:port}/
-dashboard = $${request-frontend-dashboard:connection-site_url}
-urlweb = $${request-frontend:connection-site_url}
-login = $${dashboard_credential:user}
-password = $${dashboard_credential:passwd}
+backend_ipv6 = https://$${dashboard_credential:user}:$${dashboard_credential:passwd}@[$${apache-php:ip}]:$${httpd-conf:port4}
+url_ipv6 = http://[$${apache-php:ip}]:$${httpd-conf:port}/
+backend_url = $${request-frontend-dashboard:connection-site_url}
+url_web = $${request-frontend:connection-site_url}
+backend_login = $${dashboard_credential:user}
+backend_password = $${dashboard_credential:passwd}
 
 [dashboard-parameters]
 recipe = slapos.recipe.template
@@ -451,10 +451,10 @@ url = $${request-frontend-phpmyadmin:connection-site_url}
 path = $${basedirectory:promises}/frontend-ajaxupload
 url = $${request-frontend-ajaxupload:connection-site_url}
 
-[frontend-dashboard-promise]
+[url-dashboard-promise]
 <= check-url-promise
-path = $${basedirectory:promises}/frontend-dashboard
-url = $${request-frontend-dashboard:connection-site_url}
+path = $${basedirectory:promises}/check-url-dashboard
+url = https://$${dashboard_credential:user}:$${dashboard_credential:passwd}@[$${apache-php:ip}]:$${httpd-conf:port4}
 
 [content-promise]
 recipe = slapos.cookbook:check_page_content
diff --git a/software/ajaxplorer/software.cfg b/software/ajaxplorer/software.cfg
index 5663c066..98c1516f 100644
--- a/software/ajaxplorer/software.cfg
+++ b/software/ajaxplorer/software.cfg
@@ -77,7 +77,7 @@ md5sum = f9ee461a59e83592c19581dc9efc7dd9
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apachephp.cfg.in
 output = ${buildout:directory}/template-apachephp.cfg
-md5sum = d882de2275f3f89b0b1acaf6f0c0963c
+md5sum = 47664e646463186f35be324a47d6ae3c
 mode = 0644
 
 [instance-apache-import]
@@ -361,3 +361,45 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
+Werkzeug = 0.9.4
+buildout-versions = 1.7
+cffi = 0.8.2
+cliff = 1.6.1
+cmd2 = 0.6.7
+cryptography = 0.3
+inotifyx = 0.2.0-1
+itsdangerous = 0.24
+lxml = 3.3.5
+meld3 = 1.0.0
+netaddr = 0.7.11
+netifaces = 0.8-1
+plone.recipe.command = 1.1
+pyOpenSSL = 0.14
+pyparsing = 2.0.2
+pytz = 2014.2
+rdiff-backup = 1.0.5
+requests = 2.2.1
+six = 1.6.1
+slapos.core = 1.0.5
+slapos.recipe.build = 0.12
+slapos.recipe.cmmi = 0.2
+slapos.recipe.download = 1.0.dev-r4053
+stevedore = 0.15
+supervisor = 3.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==1.0.5
+Flask = 0.10.1
+
+# Required by:
+# slapos.cookbook==0.85
+lock-file = 2.0
+
+# Required by:
+# cffi==0.8.2
+pycparser = 2.10
+
+# Required by:
+# slapos.core==1.0.5
+zope.interface = 4.1.1
\ No newline at end of file
-- 
2.30.9