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
Eric Zheng
slapos
Commits
9fd2708e
Commit
9fd2708e
authored
May 14, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lamp'
parents
180b0290
f828e70a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
component/apache-php/buildout.cfg
component/apache-php/buildout.cfg
+2
-2
slapos/recipe/apachephp/__init__.py
slapos/recipe/apachephp/__init__.py
+7
-5
No files found.
component/apache-php/buildout.cfg
View file @
9fd2708e
...
@@ -20,8 +20,8 @@ extends =
...
@@ -20,8 +20,8 @@ extends =
[apache-php]
[apache-php]
# Note: Shall react on each build of apache and reinstall itself
# Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://fr2.php.net/distributions/php-5.3.1
0
.tar.gz
url = http://fr2.php.net/distributions/php-5.3.1
3
.tar.gz
md5sum =
2b3d2d0ff22175685978fb6a5cbcdc13
md5sum =
179c67ce347680f468edbfc3c425476a
configure-options =
configure-options =
--with-apxs2=${apache:location}/bin/apxs
--with-apxs2=${apache:location}/bin/apxs
--with-libxml-dir=${libxml2:location}
--with-libxml-dir=${libxml2:location}
...
...
slapos/recipe/apachephp/__init__.py
View file @
9fd2708e
...
@@ -37,9 +37,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -37,9 +37,9 @@ class Recipe(GenericBaseRecipe):
path_list
=
[]
path_list
=
[]
# Copy application
# Copy application
shutil
.
rmtree
(
self
.
options
[
'htdocs'
])
if
not
os
.
path
.
exists
(
self
.
options
[
'htdocs'
]):
shutil
.
copytree
(
self
.
options
[
'source'
],
shutil
.
copytree
(
self
.
options
[
'source'
],
self
.
options
[
'htdocs'
])
self
.
options
[
'htdocs'
])
# Install php.ini
# Install php.ini
php_ini
=
self
.
createFile
(
os
.
path
.
join
(
self
.
options
[
'php-ini-dir'
],
php_ini
=
self
.
createFile
(
os
.
path
.
join
(
self
.
options
[
'php-ini-dir'
],
...
@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe):
...
@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe):
# Reload apache configuration
# Reload apache configuration
with
open
(
self
.
options
[
'pid-file'
])
as
pid_file
:
with
open
(
self
.
options
[
'pid-file'
])
as
pid_file
:
pid
=
int
(
pid_file
.
read
().
strip
(),
10
)
pid
=
int
(
pid_file
.
read
().
strip
(),
10
)
os
.
kill
(
pid
,
signal
.
SIGUSR1
)
# Graceful restart
try
:
os
.
kill
(
pid
,
signal
.
SIGUSR1
)
# Graceful restart
except
OSError
:
pass
return
path_list
return
path_list
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