Skip to content

slapos
slapos
Commit dc10dca0 authored by Mayoro Diagne's avatar Mayoro Diagne
Browse files
Options

clean software.cfg after solving merge conflicts

parent 41ada8fa
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 17 deletions
software/drupal/software.cfg
View file @ dc10dca0
...@@ -5,7 +5,6 @@ extends = ...@@ -5,7 +5,6 @@ extends =
[application] [application]
recipe = slapos.recipe.build:download-unpacked recipe = slapos.recipe.build:download-unpacked
url = http://ftp.drupal.org/files/projects/drupal-7.15.tar.gz url = http://ftp.drupal.org/files/projects/drupal-7.15.tar.gz
md5sum = f42c9baccd74e1d035d61ff537ae21b4 md5sum = f42c9baccd74e1d035d61ff537ae21b4
...@@ -15,22 +14,7 @@ url = ${:_profile_base_location_}/settings.php.in ...@@ -15,22 +14,7 @@ url = ${:_profile_base_location_}/settings.php.in
md5sum = add9e4e96094a9d3fb7cf0f4d26ae544 md5sum = add9e4e96094a9d3fb7cf0f4d26ae544
download-only = True download-only = True
filename = template.in filename = template.in
mode = 0644
[instance-recipe]
egg = slapos.cookbook
module = lamp.simple
# Default template for the instance.
#md5sum = Student shall put md5 of instance.cfg here
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
[application-configuration] [application-configuration]
......
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