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
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
1a30a41b
Commit
1a30a41b
authored
May 15, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix lamp: don't automatically create htdocs directory
parent
068ddadb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+1
-1
stack/lamp/instance-apache-php.cfg
stack/lamp/instance-apache-php.cfg
+2
-3
No files found.
stack/lamp/buildout.cfg
View file @
1a30a41b
...
@@ -69,7 +69,7 @@ mode = 0644
...
@@ -69,7 +69,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-php.cfg
url = ${:_profile_base_location_}/instance-apache-php.cfg
output = ${buildout:directory}/template-apache-php.cfg
output = ${buildout:directory}/template-apache-php.cfg
md5sum =
7fad5ca60c33f6f5ba91c511f8aaae39
md5sum =
b98e76abcf091ea0aee20d1ac59bb877
mode = 0644
mode = 0644
[template-apache-backup]
[template-apache-backup]
...
...
stack/lamp/instance-apache-php.cfg
View file @
1a30a41b
...
@@ -47,12 +47,12 @@ source = ${application:location}
...
@@ -47,12 +47,12 @@ source = ${application:location}
template = ${application-template:location}/${application-template:filename}
template = ${application-template:location}/${application-template:filename}
configuration = ${application-configuration:location}
configuration = ${application-configuration:location}
htdocs = $${
directory:htdocs}
htdocs = $${
rootdirectory:srv}/www/
pid-file = $${basedirectory:run}/apache.pid
pid-file = $${basedirectory:run}/apache.pid
lock-file = $${basedirectory:run}/apache.lock
lock-file = $${basedirectory:run}/apache.lock
ip = $${slap-network-information:global-ipv6}
ip = $${slap-network-information:global-ipv6}
port = 8080
port = 8080
url = http://[$${:ip}
:$${:port}]
/
url = http://[$${:ip}
]:$${:port}
/
error-log = $${directory:httpd-log}/error.log
error-log = $${directory:httpd-log}/error.log
access-log = $${directory:httpd-log}/access.log
access-log = $${directory:httpd-log}/access.log
php-ini-dir = $${directory:php-ini-dir}
php-ini-dir = $${directory:php-ini-dir}
...
@@ -205,7 +205,6 @@ promises = $${rootdirectory:etc}/promise/
...
@@ -205,7 +205,6 @@ promises = $${rootdirectory:etc}/promise/
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
ca-dir = $${rootdirectory:srv}/ssl/
ca-dir = $${rootdirectory:srv}/ssl/
htdocs = $${rootdirectory:srv}/www/
httpd-log = $${basedirectory:log}/apache/
httpd-log = $${basedirectory:log}/apache/
php-ini-dir = $${rootdirectory:etc}/php/
php-ini-dir = $${rootdirectory:etc}/php/
tmp-php = $${rootdirectory:tmp}/php/
tmp-php = $${rootdirectory:tmp}/php/
...
...
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