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
isaak yansane-sisk
slapos
Commits
fa32bcc7
Commit
fa32bcc7
authored
Aug 08, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
etherpad-lite: md5 update and pinning last repository
parent
7096572a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
software/etherpad-lite/common.cfg
software/etherpad-lite/common.cfg
+3
-3
software/etherpad-lite/instance-etherpad-lite.cfg
software/etherpad-lite/instance-etherpad-lite.cfg
+0
-8
No files found.
software/etherpad-lite/common.cfg
View file @
fa32bcc7
...
@@ -45,8 +45,8 @@ eggs = ${instance-recipe:egg}
...
@@ -45,8 +45,8 @@ eggs = ${instance-recipe:egg}
[etherpad-lite-repository]
[etherpad-lite-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://github.com/ether/etherpad-lite.git
repository = http://github.com/ether/etherpad-lite.git
branch = develop
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
revision = cb3ab51ee14aefb2f9e71bdd9907c0a83c3aebb3
[template]
[template]
# Default template for the instance.
# Default template for the instance.
...
@@ -59,7 +59,7 @@ mode = 0644
...
@@ -59,7 +59,7 @@ mode = 0644
[instance-etherpad-lite]
[instance-etherpad-lite]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-etherpad-lite.cfg
url = ${:_profile_base_location_}/instance-etherpad-lite.cfg
md5sum =
fd7249be8988155110234c7bb877abb9
md5sum =
64ae9271f20e432ddc0516fe1bb17076
output = ${buildout:directory}/template-etherpad-lite.cfg
output = ${buildout:directory}/template-etherpad-lite.cfg
mode = 0644
mode = 0644
...
@@ -68,7 +68,7 @@ recipe = slapos.recipe.download
...
@@ -68,7 +68,7 @@ recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/templates/${:filename}
mode = 0644
mode = 0644
filename = settings.json.in
filename = settings.json.in
md5sum =
19ab39e6b3256c82fd54ce074488b136
md5sum =
f9baee09003676fc1141f9bf4481f6a3
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template-run-script]
[template-run-script]
...
...
software/etherpad-lite/instance-etherpad-lite.cfg
View file @
fa32bcc7
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
parts =
parts =
etherpad-lite
etherpad-lite
publish-connection-informations
publish-connection-informations
# frontend-etherpad
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
@@ -70,10 +69,3 @@ slave = true
...
@@ -70,10 +69,3 @@ slave = true
config = url
config = url
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
return = site_url
return = site_url
[frontend-etherpad]
recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend-etherpad
url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
\ 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