diff --git a/buildout/instance-profiles/apache.cfg b/buildout/instance-profiles/apache.cfg index f72e7cdaba5d69157819385812c8b8ff85673d3f..77f97e5b0ab2fbec5fd0c5a8c95b15e0bdca298c 100644 --- a/buildout/instance-profiles/apache.cfg +++ b/buildout/instance-profiles/apache.cfg @@ -1,59 +1,14 @@ [buildout] -parts = apache-instance +parts = zope-frontend -[configuration] -httpd_port = 8181 -#httpd_host = 127.0.0.1 -httpd_datadir = ${buildout:var-directory}/httpd -httpd_htdocs = ${:httpd_datadir}/htdocs -httpd_cgibin = ${:httpd_datadir}/cgi-bin -httpd_vhost_rewrite_rules = - RewriteRule ^/static(.*) ${configuration:httpd_htdocs}$1 [L] -httpd_extra_conf = - # Additional Configuration +[zope-frontend] +recipe = erp5.recipe.apache +httpd_binary = ${software_definition:software_home}/parts/apache/bin/httpd +openssl_binary = ${software_definition:software_home}/parts/openssl/bin/openssl -[apache-httpd] -recipe = collective.recipe.template -input = ${software_definition:software_home}/templates/httpd.in -output = ${buildout:data-bin-directory}/httpd -config-path = ${apache-conf:output} -binary = ${software_definition:software_home}/parts/apache/bin/httpd -mode = 755 - -[apache-vhost] -recipe = collective.recipe.template -input = ${software_definition:software_home}/templates/httpd.vhost.conf.in -output = ${buildout:var-directory}/etc/httpd.vhost.conf -httpd_port = ${configuration:httpd_port} -httpd_htdocs = ${configuration:httpd_htdocs} -httpd_vhost_rewrite_rules = ${configuration:httpd_vhost_rewrite_rules} - -[apache-conf] -recipe = collective.recipe.template -input = ${software_definition:software_home}/templates/httpd.conf.in -output = ${buildout:var-directory}/etc/httpd.conf -server_root = ${software_definition:software_home}/parts/apache -httpd_port = ${configuration:httpd_port} -httpd_htdocs = ${configuration:httpd_htdocs} -httpd_cgibin = ${configuration:httpd_cgibin} -httpd_extra_conf = ${configuration:httpd_extra_conf} -error_log = ${buildout:log-directory}/httpd/error_log -access_log = ${buildout:log-directory}/httpd/access_log -include_config = ${buildout:var-directory}/etc/*.vhost.conf - -[apache-instance] -depends = - ${create-directories:command} - ${apache-httpd:output} - ${apache-conf:output} - ${apache-vhost:output} - -recipe = plone.recipe.command -command = - mkdir -p ${configuration:httpd_htdocs} - mkdir -p ${configuration:httpd_cgibin} - mkdir -p ${buildout:log-directory}/httpd - [ -f ${configuration:httpd_htdocs}/index.html ] || echo "<html><body><h1>It works!</h1></body></html>" > ${configuration:httpd_htdocs}/index.html - -update-command = ${:command} +ip = 127.0.0.1 +port = 42080 +server_name = localhost +backend_mapping = + 127.0.0.1:18080/ / diff --git a/buildout/templates/README.txt b/buildout/templates/README.txt deleted file mode 100644 index 2c1bde4745519202c276d238173ca5e6d086a406..0000000000000000000000000000000000000000 --- a/buildout/templates/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -Containts templates used by buildout. -Warning: This is obsolete way of delivering templates. - Please do not add new templates, merge them with eggs and provide - good defaults. All added templates can be removed without further - notice. diff --git a/buildout/templates/httpd.conf.in b/buildout/templates/httpd.conf.in deleted file mode 100644 index 7f38a592832c48d4ad58882eeedd749076ee8236..0000000000000000000000000000000000000000 --- a/buildout/templates/httpd.conf.in +++ /dev/null @@ -1,159 +0,0 @@ -ServerRoot "${:server_root}" - -#Listen 12.34.56.78:80 -Listen ${:httpd_port} - -# LoadModule foo_module modules/mod_foo.so -LoadModule authn_file_module modules/mod_authn_file.so -LoadModule authn_dbm_module modules/mod_authn_dbm.so -LoadModule authn_anon_module modules/mod_authn_anon.so -LoadModule authn_dbd_module modules/mod_authn_dbd.so -LoadModule authn_default_module modules/mod_authn_default.so -LoadModule authn_alias_module modules/mod_authn_alias.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule authz_groupfile_module modules/mod_authz_groupfile.so -LoadModule authz_user_module modules/mod_authz_user.so -LoadModule authz_dbm_module modules/mod_authz_dbm.so -LoadModule authz_owner_module modules/mod_authz_owner.so -LoadModule authz_default_module modules/mod_authz_default.so -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule auth_digest_module modules/mod_auth_digest.so -LoadModule cache_module modules/mod_cache.so -LoadModule disk_cache_module modules/mod_disk_cache.so -LoadModule dbd_module modules/mod_dbd.so -LoadModule bucketeer_module modules/mod_bucketeer.so -LoadModule dumpio_module modules/mod_dumpio.so -LoadModule echo_module modules/mod_echo.so -LoadModule case_filter_module modules/mod_case_filter.so -LoadModule case_filter_in_module modules/mod_case_filter_in.so -LoadModule ext_filter_module modules/mod_ext_filter.so -LoadModule include_module modules/mod_include.so -LoadModule filter_module modules/mod_filter.so -LoadModule substitute_module modules/mod_substitute.so -LoadModule charset_lite_module modules/mod_charset_lite.so -LoadModule deflate_module modules/mod_deflate.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule log_forensic_module modules/mod_log_forensic.so -LoadModule logio_module modules/mod_logio.so -LoadModule env_module modules/mod_env.so -LoadModule mime_magic_module modules/mod_mime_magic.so -LoadModule cern_meta_module modules/mod_cern_meta.so -LoadModule expires_module modules/mod_expires.so -LoadModule headers_module modules/mod_headers.so -LoadModule ident_module modules/mod_ident.so -LoadModule usertrack_module modules/mod_usertrack.so -LoadModule unique_id_module modules/mod_unique_id.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule version_module modules/mod_version.so -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_connect_module modules/mod_proxy_connect.so -LoadModule proxy_ftp_module modules/mod_proxy_ftp.so -LoadModule proxy_http_module modules/mod_proxy_http.so -LoadModule proxy_scgi_module modules/mod_proxy_scgi.so -LoadModule proxy_ajp_module modules/mod_proxy_ajp.so -LoadModule proxy_balancer_module modules/mod_proxy_balancer.so -LoadModule ssl_module modules/mod_ssl.so -LoadModule optional_hook_export_module modules/mod_optional_hook_export.so -LoadModule optional_hook_import_module modules/mod_optional_hook_import.so -LoadModule optional_fn_import_module modules/mod_optional_fn_import.so -LoadModule optional_fn_export_module modules/mod_optional_fn_export.so -LoadModule mime_module modules/mod_mime.so -LoadModule dav_module modules/mod_dav.so -LoadModule status_module modules/mod_status.so -LoadModule autoindex_module modules/mod_autoindex.so -LoadModule asis_module modules/mod_asis.so -LoadModule info_module modules/mod_info.so -LoadModule cgi_module modules/mod_cgi.so -LoadModule cgid_module modules/mod_cgid.so -LoadModule dav_fs_module modules/mod_dav_fs.so -LoadModule vhost_alias_module modules/mod_vhost_alias.so -LoadModule negotiation_module modules/mod_negotiation.so -LoadModule dir_module modules/mod_dir.so -LoadModule imagemap_module modules/mod_imagemap.so -LoadModule actions_module modules/mod_actions.so -LoadModule speling_module modules/mod_speling.so -LoadModule userdir_module modules/mod_userdir.so -LoadModule alias_module modules/mod_alias.so -LoadModule rewrite_module modules/mod_rewrite.so - -<IfModule !mpm_netware_module> -<IfModule !mpm_winnt_module> -User daemon -Group daemon - -</IfModule> -</IfModule> - -ServerAdmin you@example.com - -DocumentRoot "${:httpd_htdocs}" - -<Directory /> - Options FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all -</Directory> - -<Directory "${:httpd_htdocs}"> - Options Indexes FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all -</Directory> - -<IfModule dir_module> - DirectoryIndex index.html -</IfModule> - -<FilesMatch "^\.ht"> - Order allow,deny - Deny from all - Satisfy All -</FilesMatch> - -ErrorLog "${:error_log}" -LogLevel warn - -<IfModule log_config_module> - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined - LogFormat "%h %l %u %t \"%r\" %>s %b" common - - <IfModule logio_module> - # You need to enable mod_logio.c to use %I and %O - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - </IfModule> - - CustomLog "${:access_log}" common - -</IfModule> - -<IfModule alias_module> - ScriptAlias /cgi-bin/ "${:httpd_cgibin}" -</IfModule> - -<Directory "${:httpd_cgibin}"> - AllowOverride None - Options None - Order allow,deny - Allow from all -</Directory> - -DefaultType text/plain - -<IfModule mime_module> - TypesConfig conf/mime.types - - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - -</IfModule> - -<IfModule ssl_module> -SSLRandomSeed startup builtin -SSLRandomSeed connect builtin -</IfModule> - -${:httpd_extra_conf} - -Include ${:include_config} diff --git a/buildout/templates/httpd.in b/buildout/templates/httpd.in deleted file mode 100755 index a63a23b625abcfb609cd45ac9b7dd8b8e272020b..0000000000000000000000000000000000000000 --- a/buildout/templates/httpd.in +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -${:binary} -f ${:config-path} $* diff --git a/buildout/templates/httpd.vhost.conf.in b/buildout/templates/httpd.vhost.conf.in deleted file mode 100644 index bcde5c940af833bd96d1abbb8e741627b4e9e9c8..0000000000000000000000000000000000000000 --- a/buildout/templates/httpd.vhost.conf.in +++ /dev/null @@ -1,18 +0,0 @@ -<VirtualHost *:${:httpd_port}> - ServerName localhost - DocumentRoot ${:httpd_htdocs} - HostnameLookups Off - UseCanonicalName Off - ServerSignature Off - RewriteEngine On - ProxyVia on - ProxyTimeout 1200 - -${:httpd_vhost_rewrite_rules} - - <Location "/"> - Order Allow,Deny - Allow from all - </Location> - -</VirtualHost>