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
Gabriel Monnerat
slapos
Commits
303a8418
Commit
303a8418
authored
Oct 31, 2011
by
Mayoro Diagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adapting software and instance to modifications on slapos
parent
46faf0e6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
24 deletions
+15
-24
software/glpi/instance.cfg
software/glpi/instance.cfg
+1
-2
software/glpi/software.cfg
software/glpi/software.cfg
+14
-22
No files found.
software/glpi/instance.cfg
View file @
303a8418
...
@@ -7,8 +7,7 @@ parts = instance
...
@@ -7,8 +7,7 @@ parts = instance
[instance]
[instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module}
recipe = ${instance-recipe:egg}:${instance-recipe:module}
source = ${application:location}
source = ${application:location}
template = ${application-template:location}/${application-template:filename}
lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
configuration = ${application-configuration:location}
httpd_binary = ${apache:location}/bin/httpd
httpd_binary = ${apache:location}/bin/httpd
mysql_binary = ${mariadb:location}/bin/mysql
mysql_binary = ${mariadb:location}/bin/mysql
...
...
software/glpi/software.cfg
View file @
303a8418
...
@@ -13,26 +13,15 @@ extends =
...
@@ -13,26 +13,15 @@ extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
allow-hosts += alastairs-place.net
[application]
[application]
recipe =
hexagonit.recipe.downloa
d
recipe =
slapos.recipe.buil
d
url = https://forge.indepnet.net/attachments/download/974/glpi-0.80.4.tar.gz
url = https://forge.indepnet.net/attachments/download/974/glpi-0.80.4.tar.gz
#md5sum = Student may put here md5sum of this file, this is good idea
md5sum = 8d6e4242c7079fcaaab734937e8d5a36
#If provided tarball does not contain top directory, option shall be changed to false
script =
#strip-top-level-dir = true
if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
[application-template]
workdir = guessworkdir(extract_dir)
recipe = slapos.recipe.download
self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
url = https://gitorious.org/~mayoro/slapos/yoro-slapos/blobs/raw/master/software/glpi/template/conf.php.in
#md5sum = Student may put here md5sum of this file, this is good idea
download-only = True
filename = template.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[application-configuration]
location = conf.php
[instance-recipe]
[instance-recipe]
egg = slapos.cookbook
egg = slapos.cookbook
...
@@ -42,6 +31,7 @@ module = lamp.simple
...
@@ -42,6 +31,7 @@ module = lamp.simple
# 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
#${:_profile_base_location_}/instance.cfg
#md5sum = Student shall put md5 of instance.cfg here
#md5sum = Student shall put md5 of instance.cfg here
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
...
@@ -49,12 +39,15 @@ mode = 0644
...
@@ -49,12 +39,15 @@ mode = 0644
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.7
python = python2.7
eggs = ${instance-recipe:egg}
eggs =
${mysql-python:egg}
${instance-recipe:egg}
slapos.toolbox[lampconfigure]
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-010
zc.buildout = 1.5.3-dev-SlapOS-010
slapos.cookbook = 0.3
1
slapos.cookbook = 0.3
2
[downloadcache-workaround]
[downloadcache-workaround]
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
...
@@ -67,4 +60,3 @@ download-cache = ${buildout:directory}/downloads
...
@@ -67,4 +60,3 @@ download-cache = ${buildout:directory}/downloads
command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
update-command = ${:command}
update-command = ${:command}
stop-on-error = True
stop-on-error = True
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