diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/template/frontend.conf.in b/slapos/recipe/erp5/src/slapos/recipe/erp5/template/frontend.conf.in deleted file mode 100644 index 3636329b5d8f8b7233436475385c49e6705fc616..0000000000000000000000000000000000000000 --- a/slapos/recipe/erp5/src/slapos/recipe/erp5/template/frontend.conf.in +++ /dev/null @@ -1,52 +0,0 @@ -# Apache configuration file for Zope -# Automatically generated - -# Basic server configuration -PidFile "%(pid_file)s" -LockFile "%(lock_file)s" -Listen [%(ip)s]:%(port)s -ServerAdmin %(server_admin)s -ServerName %(server_name)s -DefaultType text/plain -TypesConfig conf/mime.types -AddType application/x-compress .Z -AddType application/x-gzip .gz .tgz - -SSLCertificateFile %(certificate)s -SSLCertificateKeyFile %(key)s -SSLRandomSeed startup builtin -SSLRandomSeed connect builtin - -# Log configuration -ErrorLog "%(error_log)s" -LogLevel warn -LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined -LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common -CustomLog "%(access_log)s" common - -# Directory protection -<Directory /> - Options FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all -</Directory> - -# Magic of Zope related rewrite -RewriteEngine On -%(rewrite_rule)s - -# List of modules -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule log_config_module modules/mod_log_config.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 diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/template/openssl.cnf.in b/slapos/recipe/erp5/src/slapos/recipe/erp5/template/openssl.cnf.in deleted file mode 100644 index 4780114e7faa56842609d9d94d746b292d7c0453..0000000000000000000000000000000000000000 --- a/slapos/recipe/erp5/src/slapos/recipe/erp5/template/openssl.cnf.in +++ /dev/null @@ -1,96 +0,0 @@ -#################################################################### -[ req ] -default_bits = 1024 -default_keyfile = privkey.pem -distinguished_name = req_distinguished_name -attributes = req_attributes -x509_extensions = v3_ca # The extentions to add to the self signed cert - -# Passwords for private keys if not present they will be prompted for -# input_password = secret -# output_password = secret - -# This sets a mask for permitted string types. There are several options. -# default: PrintableString, T61String, BMPString. -# pkix : PrintableString, BMPString (PKIX recommendation before 2004) -# utf8only: only UTF8Strings (PKIX recommendation after 2004). -# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings). -# MASK:XXXX a literal mask value. -# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings. -string_mask = utf8only - -# req_extensions = v3_req # The extensions to add to a certificate request - -[ req_distinguished_name ] -countryName = Country Name (2 letter code) -countryName_default = XX -countryName_min = 2 -countryName_max = 2 - -stateOrProvinceName = State or Province Name (full name) -stateOrProvinceName_default = Somewhere - -localityName = Locality Name (eg, city) - -0.organizationName = Organization Name (eg, company) -0.organizationName_default = erp5.recipe.apache autogeneration - -# we can do this but it is not needed normally :-) -#1.organizationName = Second Organization Name (eg, company) -#1.organizationName_default = World Wide Web Pty Ltd - -organizationalUnitName = Organization Unit Name -organizationalUnitName_default = Unknown - -commonName = Common Name -commonName_default = %(server_name)s -commonName_max = 64 - -emailAddress = Email Address -emailAddress_max = 64 - -# SET-ex3 = SET extension number 3 - -[ req_attributes ] -challengePassword = A challenge password -challengePassword_min = 4 -challengePassword_max = 20 - -unstructuredName = An optional company name - -[ v3_ca ] - - -# Extensions for a typical CA - - -# PKIX recommendation. - -subjectKeyIdentifier=hash - -authorityKeyIdentifier=keyid:always,issuer - -# This is what PKIX recommends but some broken software chokes on critical -# extensions. -#basicConstraints = critical,CA:true -# So we do this instead. -basicConstraints = CA:true - -# Key usage: this is typical for a CA certificate. However since it will -# prevent it being used as an test self-signed certificate it is best -# left out by default. -# keyUsage = cRLSign, keyCertSign - -# Some might want this also -# nsCertType = sslCA, emailCA - -# Include email address in subject alt name: another PKIX recommendation -# subjectAltName=email:copy -# Copy issuer details -# issuerAltName=issuer:copy - -# DER hex encoding of an extension: beware experts only! -# obj=DER:02:03 -# Where 'obj' is a standard or added object -# You can even override a supported extension: -# basicConstraints= critical, DER:30:03:01:01:FF