Skip to content

slapos-caddy
slapos-caddy
Commit 3092f8fa authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Merge branch 'xwiki'

parents 4c1db4d5 fef5e8f7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
software/xwiki/instance.cfg
View file @ 3092f8fa
...@@ -6,7 +6,7 @@ parts = instance ...@@ -6,7 +6,7 @@ parts = instance
[instance] [instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module} recipe = ${instance-recipe:egg}:${instance-recipe:module}
hsql_location = ${hsql:location}/hsqldb.jar jdbc_location = ${jdbc:location}/mysql-connector-java-5.1.17/mysql-connector-java-5.1.17-bin.jar
tomcat_location = ${tomcat:location} tomcat_location = ${tomcat:location}
xwiki_location = ${xwiki:location} xwiki_location = ${xwiki:location}
java_home = ${java:location} java_home = ${java:location}
......
software/xwiki/software.cfg
View file @ 3092f8fa
...@@ -20,7 +20,7 @@ eggs = ${instance-recipe:egg} ...@@ -20,7 +20,7 @@ eggs = ${instance-recipe:egg}
# Default template for the instance. # Default template for the instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = fdf7f3130f8c3ab804dccf163eb92d90 md5sum = dbdc297502f0258c85fe7dfbddc8e501
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
......
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