Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kwabena Antwi-Boasiako
slapos
Commits
0773763f
Commit
0773763f
authored
Aug 13, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
davstorage: First set of promises
parent
b81115fa
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
113 additions
and
7 deletions
+113
-7
software/davstorage/common.cfg
software/davstorage/common.cfg
+30
-2
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+43
-4
software/davstorage/software.cfg
software/davstorage/software.cfg
+2
-1
software/davstorage/templates/test-boot.js
software/davstorage/templates/test-boot.js
+14
-0
software/davstorage/templates/test-postfix.sh.in
software/davstorage/templates/test-postfix.sh.in
+11
-0
software/davstorage/templates/test-sendmail.php
software/davstorage/templates/test-sendmail.php
+13
-0
No files found.
software/davstorage/common.cfg
View file @
0773763f
...
@@ -14,6 +14,7 @@ extends =
...
@@ -14,6 +14,7 @@ extends =
../../component/python-2.7/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/gzip/buildout.cfg
../../component/gzip/buildout.cfg
../../component/postfix/buildout.cfg
../../component/postfix/buildout.cfg
../../component/phantomjs/buildout.cfg
find-links +=
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/slapos.buildout/
...
@@ -51,6 +52,9 @@ parts =
...
@@ -51,6 +52,9 @@ parts =
sendmail-script-template
sendmail-script-template
postfix-conf-template
postfix-conf-template
postfix-master-conf-template
postfix-master-conf-template
test-ajaxplorer-js-template
test-sendmail-php-template
postfix-promise-template
lxml-python
lxml-python
eggs
eggs
instance-recipe-egg
instance-recipe-egg
...
@@ -87,7 +91,7 @@ mode = 0644
...
@@ -87,7 +91,7 @@ mode = 0644
[instance-davstorage]
[instance-davstorage]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg
url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum =
19485b63b21496eb751e5ac5815487b4
md5sum =
976a4ca0d68ae88e9f0e1d6835cb2aab
output = ${buildout:directory}/template-davstorage.cfg
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
mode = 0644
...
@@ -167,5 +171,29 @@ mode = 0644
...
@@ -167,5 +171,29 @@ mode = 0644
md5sum = de33aa9ef530ef3c7661b914d2d1fbef
md5sum = de33aa9ef530ef3c7661b914d2d1fbef
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[test-ajaxplorer-js-template]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/${:filename}
filename = test-boot.js
mode = 0644
md5sum = 5ea198171b5fe139e83969f684005aae
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[test-sendmail-php-template]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/${:filename}
filename = test-sendmail.php
mode = 0644
md5sum = ab19eff22b50fbab18879f7b96ae7e8e
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[postfix-promise-template]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/${:filename}
filename = test-postfix.sh.in
mode = 0644
md5sum = d725575994cd871e6c6c419603605fe5
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[lxml-python]
[lxml-python]
python = python2.7
python = python2.7
software/davstorage/instance-davstorage.cfg
View file @
0773763f
...
@@ -15,6 +15,9 @@ parts =
...
@@ -15,6 +15,9 @@ parts =
postfix-users
postfix-users
postfix-master-conf
postfix-master-conf
postfix-service
postfix-service
ajaxplorer-load-promise
test-sendmail-php
postfix-promise
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
@@ -22,8 +25,8 @@ offline = true
...
@@ -22,8 +25,8 @@ offline = true
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
webdav_access =
https://$${request-frontend:connection-domain
}
webdav_access =
$${request-frontend:config-url
}
url =
https://$${request-frontend-ajaxupload:connection-domain
}
url =
$${request-frontend-ajaxupload:config-url
}
webdav_user = $${davstorage:user}
webdav_user = $${davstorage:user}
webdav_password = $${davstorage:password}
webdav_password = $${davstorage:password}
...
@@ -180,6 +183,7 @@ public = $${directory:spool}/public
...
@@ -180,6 +183,7 @@ public = $${directory:spool}/public
pid = $${directory:spool}/pid
pid = $${directory:spool}/pid
saved = $${directory:spool}/saved
saved = $${directory:spool}/saved
trace = $${directory:spool}/trace
trace = $${directory:spool}/trace
promise-js = $${rootdirectory:etc}/js/
[copy-app]
[copy-app]
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -250,10 +254,45 @@ output = $${directory:postfix-conf}/master.cf
...
@@ -250,10 +254,45 @@ output = $${directory:postfix-conf}/master.cf
mode = 0644
mode = 0644
md5sum = de33aa9ef530ef3c7661b914d2d1fbef
md5sum = de33aa9ef530ef3c7661b914d2d1fbef
[ajaxplorer-load-js]
recipe = slapos.recipe.template
url = ${test-ajaxplorer-js-template:location}/${test-ajaxplorer-js-template:filename}
content-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
mode = 0644
md5sum = 5ea198171b5fe139e83969f684005aae
output = $${directory:promise-js}/test-boot.js
[ajaxplorer-load-promise]
recipe = slapos.cookbook:check_page_content_phantomjs
path = $${basedirectory:promises}/ajaxplorer-load-promise
dash-path = ${dash:location}/bin/dash
phantomjs-path = ${phantomjs:location}/phantomjs-slapos
phantomjs-options = --ignore-ssl-errors=true
script-path = $${ajaxplorer-load-js:output}
[test-sendmail-php]
recipe = slapos.recipe.template
url = ${test-sendmail-php-template:location}/${test-sendmail-php-template:filename}
php-location = ${apache-php:location}/bin/php
htdocs-location = $${directory:htdocs}
output = $${rootdirectory:bin}/test-sendmail.php
mode = 0755
md5sum = ab19eff22b50fbab18879f7b96ae7e8e
[postfix-promise]
recipe = slapos.recipe.template
url = ${postfix-promise-template:location}/${postfix-promise-template:filename}
dash-path = ${dash:location}/bin/dash
test-sendmail-php-location = $${test-sendmail-php:output}
sendmail-binary = $${sendmail-script:output}
output = $${basedirectory:promises}/postfix-promise
md5sum = d725575994cd871e6c6c419603605fe5
mode = 0755
# Request frontend
# Request frontend
[request-frontend-ajaxupload]
[request-frontend-ajaxupload]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:request
recipe = slapos.cookbook:request
optional
name = Frontend Ajax
name = Frontend Ajax
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
...
@@ -265,7 +304,7 @@ return = domain
...
@@ -265,7 +304,7 @@ return = domain
[request-frontend]
[request-frontend]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:request
recipe = slapos.cookbook:request
optional
name = Frontend Webdav
name = Frontend Webdav
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
...
...
software/davstorage/software.cfg
View file @
0773763f
...
@@ -16,7 +16,8 @@ develop =
...
@@ -16,7 +16,8 @@ develop =
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
repository = http://git.erp5.org/repos/slapos.git
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
revision = 4295f66416c7c94cfef174c55e22901e8d6d1562
branch = davstorage-ajaxplorer
#revision =
[slapos.toolbox-repository]
[slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
...
...
software/davstorage/templates/test-boot.js
0 → 100644
View file @
0773763f
var
page
=
require
(
'
webpage
'
).
create
();
var
url
=
'
${:content-url}
'
page
.
open
(
url
,
function
(
status
){
var
text
=
page
.
evaluate
(
function
(){
return
document
.
getElementById
(
'
start_button
'
).
textContent
;
});
if
(
text
!==
'
Start wizard!
'
){
phantom
.
exit
(
1
);
}
else
{
phantom
.
exit
();
}
});
software/davstorage/templates/test-postfix.sh.in
0 → 100644
View file @
0773763f
#!${:dash-path}
${:test-sendmail-php-location} > /dev/null
RETURN=$(${:sendmail-binary} -bp)
if [ "$RETURN" != "Mail queue is empty" ]; then
exit 0
else
exit 1
fi
\ No newline at end of file
software/davstorage/templates/test-sendmail.php
0 → 100644
View file @
0773763f
#!${:php-location}
<?
php
require_once
(
"${:htdocs-location}/plugins/mailer.phpmailer-lite/lib/class.phpmailer-lite.php"
);
$mailer
=
new
PHPMailerLite
(
true
);
$mailer
->
SetFrom
(
'test@couscous.com'
);
$mailer
->
AddAddress
(
'couscous@test.com'
);
$mailer
->
Subject
=
'test'
;
$mailer
->
Body
=
'test'
;
$mailer
->
Send
();
?>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment