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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
slapos
Commits
4348f872
Commit
4348f872
authored
Nov 01, 2011
by
Mayoro Diagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updating software and instance for phenix according changes of slapos
parent
f04810ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
24 deletions
+16
-24
software/phenix/instance.cfg
software/phenix/instance.cfg
+2
-3
software/phenix/software.cfg
software/phenix/software.cfg
+14
-21
No files found.
software/phenix/instance.cfg
View file @
4348f872
...
@@ -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
...
@@ -17,4 +16,4 @@ mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
...
@@ -17,4 +16,4 @@ mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
mysqld_binary = ${mariadb:location}/libexec/mysqld
mysqld_binary = ${mariadb:location}/libexec/mysqld
delete = install
delete = install
table_name = admin
table_name = admin
constraint =
`admin_id`>0
constraint =
(`admin_login`='admin' AND `admin_passwd`<>'21232f297a57a5a743894a0e4a801fc3') OR (`admin_id`>1)
software/phenix/software.cfg
View file @
4348f872
...
@@ -13,27 +13,16 @@ extends =
...
@@ -13,27 +13,16 @@ 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 = http://www.phenix.gapi.fr/download/phenix_501.zip
url = http://www.phenix.gapi.fr/download/phenix_501.zip
#md5sum = Student may put here md5sum of this file, this is good idea
md5sum = 0538d2146f2cb01b24ae692928d8e92e
#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/phenix/template/conf.inc.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.inc.php
[instance-recipe]
[instance-recipe]
egg = slapos.cookbook
egg = slapos.cookbook
module = lamp.simple
module = lamp.simple
...
@@ -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,11 +39,15 @@ mode = 0644
...
@@ -49,11 +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.32
[downloadcache-workaround]
[downloadcache-workaround]
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
...
@@ -66,4 +60,3 @@ download-cache = ${buildout:directory}/downloads
...
@@ -66,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