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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos
Commits
fa2d77ff
Commit
fa2d77ff
authored
Jul 04, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switching frontend to mandatory request
parent
286af66f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
software/davstorage/common.cfg
software/davstorage/common.cfg
+1
-1
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+8
-7
No files found.
software/davstorage/common.cfg
View file @
fa2d77ff
...
...
@@ -76,7 +76,7 @@ mode = 0644
[instance-davstorage]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum =
b60ef53023921a2e6d072e31b52f555e
md5sum =
699ecf4678386667f58a3391bab7af0f
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
...
...
software/davstorage/instance-davstorage.cfg
View file @
fa2d77ff
...
...
@@ -16,8 +16,8 @@ offline = true
[publish-connection-informations]
recipe = slapos.cookbook:publish
webdav_access =
$${request-frontend:connection-site_url
}
url =
$${request-frontend-ajaxupload:connection-site_url
}
webdav_access =
https://$${request-frontend:connection-domain
}
url =
https://$${request-frontend-ajaxupload:connection-domain
}
webdav_user = $${davstorage:user}
webdav_password = $${davstorage:password}
...
...
@@ -161,18 +161,19 @@ tmp-php = $${rootdirectory:tmp}/php
# Request frontend
[request-frontend-ajaxupload]
<= slap-connection
recipe = slapos.cookbook:request
optional
recipe = slapos.cookbook:request
name = Frontend Ajax
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url
config = url https-only
config-https-only = true
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
return =
site_url
return =
domain
[request-frontend]
<= slap-connection
recipe = slapos.cookbook:request
optional
recipe = slapos.cookbook:request
name = Frontend Webdav
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
...
...
@@ -180,7 +181,7 @@ slave = true
config = url https-only
config-https-only = true
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
return =
site_url
return =
domain
# XXX Vivien: promise not working for now
#[frontend-ajaxupload-promise]
...
...
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