Skip to content

S
slapos
Commit 87b207ef authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

Fix frontend promise, create index.html for websites

parent ece79a5b
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 10 deletions
software/ajaxplorer/instance-apachephp.cfg
View file @ 87b207ef
...@@ -339,21 +339,21 @@ port = $${apache-php:port} ...@@ -339,21 +339,21 @@ port = $${apache-php:port}
[frontend-website-promise] [frontend-website-promise]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend path = $${basedirectory:promises}/frontend-website
url = $${request-frontend:connection-site_url} url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
[frontend-website2-promise] [frontend-website2-promise]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend path = $${basedirectory:promises}/frontend-website2
url = $${request-frontend2:connection-site_url} url = $${request-frontend2:connection-site_url}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
[frontend-ajaxupload-promise] [frontend-ajaxupload-promise]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend path = $${basedirectory:promises}/frontend-ajaxupload
url = $${request-frontend-ajaxupload:connection-site_url} url = $${request-frontend-ajaxupload:connection-site_url}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
...@@ -362,7 +362,7 @@ curl_path = ${curl:location}/bin/curl ...@@ -362,7 +362,7 @@ curl_path = ${curl:location}/bin/curl
recipe = slapos.cookbook:check_page_content recipe = slapos.cookbook:check_page_content
path = $${basedirectory:promises}/content path = $${basedirectory:promises}/content
url = $${request-frontend-ajaxupload:connection-site_url} url = $${request-frontend-ajaxupload:connection-site_url}
pattern = AjaXplorer match = AjaXplorer
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
......
software/ajaxplorer/software.cfg
View file @ 87b207ef
...@@ -12,7 +12,8 @@ parts = ...@@ -12,7 +12,8 @@ parts =
instance-mariadb instance-mariadb
template-httpd-conf template-httpd-conf
application application
website website1-template
website2-template
slapos.cookbook-repository slapos.cookbook-repository
check-recipe check-recipe
...@@ -40,7 +41,7 @@ md5sum = 4c7936accb3658871b635158198b7905 ...@@ -40,7 +41,7 @@ md5sum = 4c7936accb3658871b635158198b7905
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apachephp.cfg url = ${:_profile_base_location_}/instance-apachephp.cfg
output = ${buildout:directory}/template-apachephp.cfg output = ${buildout:directory}/template-apachephp.cfg
md5sum = e89aed0fe9697e18bd210a82b82f3b27 md5sum = 6874902dc758cf9db49b0395a88aa647
mode = 0644 mode = 0644
[instance-mariadb] [instance-mariadb]
...@@ -51,15 +52,31 @@ mode = 0644 ...@@ -51,15 +52,31 @@ mode = 0644
[application] [application]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = http://netcologne.dl.sourceforge.net/project/ajaxplorer/ajaxplorer/dev-channel/4.3.3/ajaxplorer-core-4.3.3.tar.gz url = http://garr.dl.sourceforge.net/project/ajaxplorer/ajaxplorer/dev-channel/4.3.4/ajaxplorer-core-4.3.4.tar.gz
md5sum = b6b1e767dd3b966a74782a03190130b0 md5sum = 2f2ff8bda7bbe841ef0e870c724eb74f
strip-top-level-dir = true strip-top-level-dir = true
[website] [website]
recipe = z3c.recipe.mkdir recipe = z3c.recipe.mkdir
path1 = ${application:location}/data/files/website
path2 = ${application:location}/data/files/website2
paths = paths =
${application:location}/data/files/website ${:path1}
${application:location}/data/files/website2 ${:path2}
[website1-template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/templates/index.html.in
output = ${website:path1}/index.html
md5sum = c5695762361b801c284ee23a150cd1f1
mode = 0644
[website2-template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/templates/index.html.in
output = ${website:path2}/index.html
md5sum = c5695762361b801c284ee23a150cd1f1
mode = 0644
[template-httpd-conf] [template-httpd-conf]
recipe = slapos.recipe.download recipe = slapos.recipe.download
......
software/ajaxplorer/templates/index.html.in 0 → 100644
View file @ 87b207ef
<html>
<head>
<title>New Document - Created By AjaXplorer</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<h2>Hi, this website folder is still empty. Please go to your File Manager administration and replace this folder by your new website files.</h2>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7