From b11b964c72f88c58858444bb04106ee72dae4c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Mon, 22 Oct 2012 14:41:50 +0200 Subject: [PATCH] Frontend: Set ServerRoot to instance_home. And use absolute paths everywhere. --- slapos/recipe/apache_frontend/__init__.py | 2 + .../apache_frontend/template/apache.conf.in | 37 ++++++++++--------- software/apache-frontend/instance.cfg | 1 + software/apache-frontend/software.cfg | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/slapos/recipe/apache_frontend/__init__.py b/slapos/recipe/apache_frontend/__init__.py index d0589641e..0c507becf 100644 --- a/slapos/recipe/apache_frontend/__init__.py +++ b/slapos/recipe/apache_frontend/__init__.py @@ -382,6 +382,8 @@ class Recipe(BaseSlapRecipe): name + '.lock') apache_conf['document_root'] = os.path.join(self.data_root_directory, 'htdocs') + apache_conf['instance_home'] = os.path.join(self.work_directory) + apache_conf['httpd_home'] = self.options['httpd_home'] apache_conf['ip_list'] = ip_list apache_conf['port'] = port apache_conf['server_admin'] = 'admin@' diff --git a/slapos/recipe/apache_frontend/template/apache.conf.in b/slapos/recipe/apache_frontend/template/apache.conf.in index 6090c1831..98c0e96ca 100644 --- a/slapos/recipe/apache_frontend/template/apache.conf.in +++ b/slapos/recipe/apache_frontend/template/apache.conf.in @@ -5,12 +5,13 @@ PidFile "%(pid_file)s" ServerName %(server_name)s DocumentRoot %(document_root)s +ServerRoot %(instance_home)s %(listen)s ServerAdmin %(server_admin)s DefaultType text/plain -TypesConfig conf/mime.types +TypesConfig %(httpd_home)s/conf/mime.types AddType application/x-compress .Z AddType application/x-gzip .gz .tgz @@ -32,23 +33,23 @@ CustomLog "%(access_log)s" common #LoadModule unixd_module modules/mod_unixd.so #LoadModule access_compat_module modules/mod_access_compat.so #LoadModule authz_core_module modules/mod_authz_core.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule deflate_module modules/mod_deflate.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule version_module modules/mod_version.so -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_http_module modules/mod_proxy_http.so -LoadModule ssl_module modules/mod_ssl.so -LoadModule mime_module modules/mod_mime.so -LoadModule dav_module modules/mod_dav.so -LoadModule dav_fs_module modules/mod_dav_fs.so -LoadModule negotiation_module modules/mod_negotiation.so -LoadModule rewrite_module modules/mod_rewrite.so -LoadModule headers_module modules/mod_headers.so -LoadModule cache_module modules/mod_cache.so -LoadModule mem_cache_module modules/mod_mem_cache.so -LoadModule antiloris_module modules/mod_antiloris.so +LoadModule authz_host_module %(httpd_home)s/modules/mod_authz_host.so +LoadModule log_config_module %(httpd_home)s/modules/mod_log_config.so +LoadModule deflate_module %(httpd_home)s/modules/mod_deflate.so +LoadModule setenvif_module %(httpd_home)s/modules/mod_setenvif.so +LoadModule version_module %(httpd_home)s/modules/mod_version.so +LoadModule proxy_module %(httpd_home)s/modules/mod_proxy.so +LoadModule proxy_http_module %(httpd_home)s/modules/mod_proxy_http.so +LoadModule ssl_module %(httpd_home)s/modules/mod_ssl.so +LoadModule mime_module %(httpd_home)s/modules/mod_mime.so +LoadModule dav_module %(httpd_home)s/modules/mod_dav.so +LoadModule dav_fs_module %(httpd_home)s/modules/mod_dav_fs.so +LoadModule negotiation_module %(httpd_home)s/modules/mod_negotiation.so +LoadModule rewrite_module %(httpd_home)s/modules/mod_rewrite.so +LoadModule headers_module %(httpd_home)s/modules/mod_headers.so +LoadModule cache_module %(httpd_home)s/modules/mod_cache.so +LoadModule mem_cache_module %(httpd_home)s/modules/mod_mem_cache.so +LoadModule antiloris_module %(httpd_home)s/modules/mod_antiloris.so # The following directives modify normal HTTP response behavior to # handle known problems with browser implementations. diff --git a/software/apache-frontend/instance.cfg b/software/apache-frontend/instance.cfg index 5578977ca..2479cc59e 100644 --- a/software/apache-frontend/instance.cfg +++ b/software/apache-frontend/instance.cfg @@ -7,6 +7,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} [instance] recipe = ${instance-recipe:egg}:${instance-recipe:module} +httpd_home = ${apache-2.2:location} httpd_binary = ${apache-2.2:location}/bin/httpd logrotate_binary = ${logrotate:location}/usr/sbin/logrotate openssl_binary = ${openssl:location}/bin/openssl diff --git a/software/apache-frontend/software.cfg b/software/apache-frontend/software.cfg index 7a4ccfe57..c96af82f3 100644 --- a/software/apache-frontend/software.cfg +++ b/software/apache-frontend/software.cfg @@ -50,7 +50,7 @@ eggs = # Default template for apache instance. recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = 74c0f41246d167c020854a212e919ce4 +md5sum = d103ccd324947a6968f291260f1b60d3 output = ${buildout:directory}/template.cfg mode = 0644 -- 2.30.9