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
Iliya Manolov
slapos
Commits
7600ecfc
Commit
7600ecfc
authored
Aug 13, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
davstorage: Password generation and md5
parent
24f33435
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
software/davstorage/common.cfg
software/davstorage/common.cfg
+4
-4
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+8
-3
No files found.
software/davstorage/common.cfg
View file @
7600ecfc
...
@@ -92,7 +92,7 @@ mode = 0644
...
@@ -92,7 +92,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 = 976a4ca0d68ae88e9f0e1d6835cb2aab
md5sum = 399a2943c70a0d32b4f598f8d1127685
output = ${buildout:directory}/template-davstorage.cfg
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
mode = 0644
...
@@ -111,7 +111,7 @@ url = ${:_profile_base_location_}/templates/${:filename}
...
@@ -111,7 +111,7 @@ url = ${:_profile_base_location_}/templates/${:filename}
filename = boot-conf-manifest.xml.in
filename = boot-conf-manifest.xml.in
language = fr
language = fr
mode = 0644
mode = 0644
#md5sum = 5f7b1e991bd46ac56656c82052501a98
md5sum = 856e39c6bf42dd28a593c45b966b97d1
output = ${application:location}/plugins/boot.conf/manifest.xml
output = ${application:location}/plugins/boot.conf/manifest.xml
[core-ajaxplorer-manifest]
[core-ajaxplorer-manifest]
...
@@ -129,7 +129,7 @@ recipe = slapos.recipe.download
...
@@ -129,7 +129,7 @@ recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/templates/${:filename}
filename = configuration.js
filename = configuration.js
mode = 0644
mode = 0644
#md5sum =
md5sum = 792917aea5bafdc9a973a9071ae89ec6
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[mailer-plugin-template]
[mailer-plugin-template]
...
@@ -185,7 +185,7 @@ recipe = slapos.recipe.download
...
@@ -185,7 +185,7 @@ recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/templates/${:filename}
filename = test-boot.js
filename = test-boot.js
mode = 0644
mode = 0644
#md5sum = 5ea198171b5fe139e83969f684005aae
md5sum = a6a98bf3c9fcb6c330dea513d13eb054
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[test-sendmail-php-template]
[test-sendmail-php-template]
...
...
software/davstorage/instance-davstorage.cfg
View file @
7600ecfc
...
@@ -31,10 +31,15 @@ url = $${request-frontend-ajaxupload:config-url}
...
@@ -31,10 +31,15 @@ url = $${request-frontend-ajaxupload:config-url}
webdav_user = $${davstorage:user}
webdav_user = $${davstorage:user}
webdav_password = $${davstorage:password}
webdav_password = $${davstorage:password}
[pass-generation]
recipe = slapos.cookbook:generate.password
storage-path = $${rootdirectory:etc}/.passwd
bytes = 4
[davstorage]
[davstorage]
recipe = slapos.cookbook:davstorage
recipe = slapos.cookbook:davstorage
user = user
user = user
password =
insecure
password =
$${pass-generation:passwd}
port_webdav = 8080
port_webdav = 8080
port_ajax = 8070
port_ajax = 8070
ip = $${slap-network-information:global-ipv6}
ip = $${slap-network-information:global-ipv6}
...
@@ -215,7 +220,7 @@ password = $${davstorage:password}
...
@@ -215,7 +220,7 @@ password = $${davstorage:password}
storage-type = serial
storage-type = serial
output = $${directory:promise-js}/${configuration-js-template:filename}
output = $${directory:promise-js}/${configuration-js-template:filename}
mode = 0644
mode = 0644
#md5sum =
md5sum = 792917aea5bafdc9a973a9071ae89ec6
[configuration-promise]
[configuration-promise]
recipe = slapos.cookbook:check_page_content_phantomjs
recipe = slapos.cookbook:check_page_content_phantomjs
...
@@ -278,7 +283,7 @@ recipe = slapos.recipe.template
...
@@ -278,7 +283,7 @@ recipe = slapos.recipe.template
url = ${test-ajaxplorer-js-template:location}/${test-ajaxplorer-js-template:filename}
url = ${test-ajaxplorer-js-template:location}/${test-ajaxplorer-js-template:filename}
content-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
content-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
mode = 0644
mode = 0644
#md5sum = 5ea198171b5fe139e83969f684005aae
md5sum = a6a98bf3c9fcb6c330dea513d13eb054
output = $${directory:promise-js}/test-boot.js
output = $${directory:promise-js}/test-boot.js
[ajaxplorer-load-promise]
[ajaxplorer-load-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