From a5172a23ea0433fee8acfe42b4070a1aa72afa89 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 3 Jan 2013 11:18:44 +0100 Subject: [PATCH] Current state --- .etckeeper | 5 + apache2/info_users_passwd | 2 + apache2/modules.d/00_apache_manual.conf | 2 +- apache2/modules.d/00_default_settings.conf | 8 +- apache2/modules.d/00_error_documents.conf | 2 +- apache2/modules.d/00_languages.conf | 2 +- apache2/modules.d/00_mod_autoindex.conf | 10 +- apache2/modules.d/00_mod_info.conf | 6 ++ apache2/modules.d/00_mod_log_config.conf | 4 +- apache2/modules.d/00_mod_mime.conf | 6 +- apache2/modules.d/00_mod_status.conf | 6 ++ apache2/modules.d/00_mpm.conf | 4 +- apache2/ssl/egroupware-cert.pem | 55 +++++++++++ apache2/vhosts.d/00_default_ssl_vhost.conf | 18 ++-- apache2/vhosts.d/00_default_vhost.conf | 2 +- apache2/vhosts.d/01_egroupware.conf | 110 +++++++++++++++++++++ apache2/vhosts.d/default_vhost.include | 2 +- conf.d/apache2 | 5 +- pear.conf | 2 + php/apache2-php5.3/php.ini | 2 + php/cli-php5.3/php.ini | 2 + portage/package.keywords | 2 + portage/package.use | 7 +- runlevels/default/apache2 | 1 + 24 files changed, 235 insertions(+), 30 deletions(-) create mode 100644 apache2/info_users_passwd create mode 100644 apache2/ssl/egroupware-cert.pem create mode 100644 apache2/vhosts.d/01_egroupware.conf create mode 100644 pear.conf create mode 120000 runlevels/default/apache2 diff --git a/.etckeeper b/.etckeeper index 8324eb7..a79ad60 100755 --- a/.etckeeper +++ b/.etckeeper @@ -61,6 +61,7 @@ maybe chgrp amavis './amavisd.conf' maybe chmod 0640 './amavisd.conf' maybe chmod 0755 './apache2' maybe chmod 0644 './apache2/httpd.conf' +maybe chmod 0644 './apache2/info_users_passwd' maybe chmod 0644 './apache2/magic' maybe chmod 0755 './apache2/modules.d' maybe chmod 0644 './apache2/modules.d/.keep_dev-vcs_subversion-0' @@ -87,10 +88,13 @@ maybe chmod 0644 './apache2/modules.d/47_mod_dav_svn.conf' maybe chmod 0644 './apache2/modules.d/70_mod_php5.conf' maybe chmod 0600 './apache2/modules.d/80_mod_auth_pgsql.conf' maybe chmod 0644 './apache2/modules.d/99_nagios3.conf' +maybe chmod 0755 './apache2/ssl' +maybe chmod 0600 './apache2/ssl/egroupware-cert.pem' maybe chmod 0755 './apache2/vhosts.d' maybe chmod 0644 './apache2/vhosts.d/.keep_www-servers_apache-2' maybe chmod 0644 './apache2/vhosts.d/00_default_ssl_vhost.conf' maybe chmod 0644 './apache2/vhosts.d/00_default_vhost.conf' +maybe chmod 0644 './apache2/vhosts.d/01_egroupware.conf' maybe chmod 0644 './apache2/vhosts.d/default_vhost.include' maybe chmod 0755 './at' maybe chgrp at './at/at.deny' @@ -1229,6 +1233,7 @@ maybe chmod 0644 './pango/x86_64-pc-linux-gnu/pango.modules' maybe chmod 0644 './papersize' maybe chmod 0644 './passwd' maybe chmod 0600 './passwd-' +maybe chmod 0644 './pear.conf' maybe chmod 0755 './php' maybe chmod 0755 './php/apache2-php5.3' maybe chmod 0755 './php/apache2-php5.3/ext' diff --git a/apache2/info_users_passwd b/apache2/info_users_passwd new file mode 100644 index 0000000..260c980 --- /dev/null +++ b/apache2/info_users_passwd @@ -0,0 +1,2 @@ +monitoring:$apr1$TqC87rAF$vXWiZcbRZMQIfC9XAVUgM. +frank:{SHA}+eH55qKwlbPV+0XIi35Lr5y1OJo= diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index db1f06d..240d6b4 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -18,7 +18,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1 RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2 - LanguagePriority en de es fr ja ko pt-br + LanguagePriority de en es fr ja ko pt-br ForceLanguagePriority Prefer Fallback diff --git a/apache2/modules.d/00_default_settings.conf b/apache2/modules.d/00_default_settings.conf index 0fa43b2..0213f2b 100644 --- a/apache2/modules.d/00_default_settings.conf +++ b/apache2/modules.d/00_default_settings.conf @@ -35,7 +35,7 @@ AccessFileName .htaccess # and compiled in modules. # Set to one of: Full | OS | Minor | Minimal | Major | Prod # where Full conveys the most information, and Prod the least. -ServerTokens Prod +ServerTokens Full # TraceEnable # This directive overrides the behavior of TRACE for both the core server and @@ -96,12 +96,12 @@ ContentDigest Off # container, error messages relating to that virtual host will be # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. -ErrorLog /var/log/apache2/error_log +ErrorLog /var/log/apache2/error.log # LogLevel: Control the number of messages logged to the error_log. # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. -LogLevel warn +LogLevel info # We configure the "default" to be a very restrictive set of features. @@ -121,7 +121,7 @@ LogLevel warn # To add files to that list use AddDirectoryIndex in a custom config # file. Do not change this entry unless you know what you are doing. - DirectoryIndex index.html index.html.var + DirectoryIndex index.html index.html.var index.shtml index.htm # The following lines prevent .htaccess and .htpasswd files from being diff --git a/apache2/modules.d/00_error_documents.conf b/apache2/modules.d/00_error_documents.conf index 815668f..90c6b0a 100644 --- a/apache2/modules.d/00_error_documents.conf +++ b/apache2/modules.d/00_error_documents.conf @@ -32,7 +32,7 @@ Alias /error/ "/usr/share/apache2/error/" AddHandler type-map var Order allow,deny Allow from all - LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr + LanguagePriority de en cs es fr it ja ko nl pl pt-br ro sv tr ForceLanguagePriority Prefer Fallback diff --git a/apache2/modules.d/00_languages.conf b/apache2/modules.d/00_languages.conf index c429bf9..48af93d 100644 --- a/apache2/modules.d/00_languages.conf +++ b/apache2/modules.d/00_languages.conf @@ -68,7 +68,7 @@ AddLanguage zh-TW .zh-tw # # Just list the languages in decreasing order of preference. We have # more or less alphabetized them here. You probably want to change this. -LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW +LanguagePriority de en ca cs da el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW # ForceLanguagePriority allows you to serve a result page rather than # MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) diff --git a/apache2/modules.d/00_mod_autoindex.conf b/apache2/modules.d/00_mod_autoindex.conf index ca2a168..e04516d 100644 --- a/apache2/modules.d/00_mod_autoindex.conf +++ b/apache2/modules.d/00_mod_autoindex.conf @@ -20,7 +20,7 @@ Alias /icons/ "/usr/share/apache2/icons/" # IndexOptions: Controls the appearance of server-generated directory # listings. -IndexOptions FancyIndexing VersionSort +IndexOptions FancyIndexing VersionSort FoldersFirst HTMLTable IgnoreCase NameWidth=50 # AddIcon* directives tell the server which icon to show for different # files or filename extensions. These are only displayed for @@ -63,9 +63,11 @@ DefaultIcon /icons/unknown.gif # directories. # Format: AddDescription "description" filename -#AddDescription "GZIP compressed document" .gz -#AddDescription "tar archive" .tar -#AddDescription "GZIP compressed tar archive" .tgz +AddDescription "GZIP-komprimiertes Tar-Archiv" .tar.gz +AddDescription "GZIP-komprimiertes Dokument" .gz +AddDescription "Tar-Archive" .tar +AddDescription "GZIP-komprimiertes Tar-Archiv" .tgz +AddDescription "PDF-Dokument" .pdf # ReadmeName is the name of the README file the server will look for by # default, and append to directory listings. diff --git a/apache2/modules.d/00_mod_info.conf b/apache2/modules.d/00_mod_info.conf index 809c223..35cbd2c 100644 --- a/apache2/modules.d/00_mod_info.conf +++ b/apache2/modules.d/00_mod_info.conf @@ -6,6 +6,12 @@ Order deny,allow Deny from all Allow from 127.0.0.1 + Allow from localhost + AuthName "Server Status Access" + AuthType Basic + AuthUserFile /etc/apache2/info_users_passwd + Require valid-user + Satisfy Any diff --git a/apache2/modules.d/00_mod_log_config.conf b/apache2/modules.d/00_mod_log_config.conf index ce0238e..d4bd85c 100644 --- a/apache2/modules.d/00_mod_log_config.conf +++ b/apache2/modules.d/00_mod_log_config.conf @@ -1,6 +1,7 @@ # The following directives define some format nicknames for use with # a CustomLog directive (see below). +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%T\" \"%v\" \"%f\"" full LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b" common @@ -11,6 +12,7 @@ LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" VLOG= # 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\" \"%T\" \"%v\" \"%f\" %I %O" full_io LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" vhostio @@ -20,7 +22,7 @@ LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O # container, they will be logged here. Contrariwise, if you *do* # define per- access logfiles, transactions will be # logged therein and *not* in this file. -CustomLog /var/log/apache2/access_log common +CustomLog /var/log/apache2/access.log full # If you would like to have agent and referer logfiles, # uncomment the following directives. diff --git a/apache2/modules.d/00_mod_mime.conf b/apache2/modules.d/00_mod_mime.conf index 51f23d5..6229e61 100644 --- a/apache2/modules.d/00_mod_mime.conf +++ b/apache2/modules.d/00_mod_mime.conf @@ -18,8 +18,8 @@ TypesConfig /etc/mime.types # AddEncoding allows you to have certain browsers uncompress # information on the fly. Note: Not all browsers support this. -#AddEncoding x-compress .Z -#AddEncoding x-gzip .gz .tgz +AddEncoding x-compress .Z +AddEncoding x-gzip .gz .tgz # If the AddEncoding directives above are commented-out, then you # probably should define those extensions to indicate media types: @@ -35,7 +35,7 @@ AddType application/x-gzip .gz .tgz #AddHandler cgi-script .cgi # For type maps (negotiated resources): -#AddHandler type-map var +AddHandler type-map var # Filters allow you to process content before it is sent to the client. # diff --git a/apache2/modules.d/00_mod_status.conf b/apache2/modules.d/00_mod_status.conf index edd46a4..615122c 100644 --- a/apache2/modules.d/00_mod_status.conf +++ b/apache2/modules.d/00_mod_status.conf @@ -6,6 +6,12 @@ Order deny,allow Deny from all Allow from 127.0.0.1 + Allow from localhost + AuthName "Server Status Access" + AuthType Basic + AuthUserFile /etc/apache2/info_users_passwd + Require valid-user + Satisfy Any # ExtendedStatus controls whether Apache will generate "full" status diff --git a/apache2/modules.d/00_mpm.conf b/apache2/modules.d/00_mpm.conf index 20effa9..27dc24d 100644 --- a/apache2/modules.d/00_mpm.conf +++ b/apache2/modules.d/00_mpm.conf @@ -28,8 +28,8 @@ PidFile /var/run/apache2.pid # MinSpareServers: Minimum number of idle child server processes # MaxSpareServers: Maximum number of idle child server processes - StartServers 5 - MinSpareServers 5 + StartServers 2 + MinSpareServers 2 MaxSpareServers 10 MaxClients 150 MaxRequestsPerChild 10000 diff --git a/apache2/ssl/egroupware-cert.pem b/apache2/ssl/egroupware-cert.pem new file mode 100644 index 0000000..e9481c3 --- /dev/null +++ b/apache2/ssl/egroupware-cert.pem @@ -0,0 +1,55 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCq0183mN/msR+N +8pDOHzfqu8moWKTzEE/u1479RyFziF87FFY2ryOj86B38WAVc/C2bNbNvMry+fVY +uYmah8YgX3tss0xpaoHnoELzrYoKATO4xRlpMYjBBVnNek5uJiMwUE5TqabbG7Q6 +qkp+BmAw7hYGpItwKSvovvge7IGdyaE3xDTJ9SM/IwIvVdlS1GQf/LdF9910tfxC +A6MMwG6tsf+MXTuTswO5Q5RP5XGTqNt3+8opGHKzn3n4zZAPQFsESVdGmLNdr2Ux +KI4sHfavSbUlh2s1/ir1SxKcQfsykFWbf9MvaACOkUrTMJz3jUGX/7b02SmXf3LI +DfDw+6nJAgMBAAECggEAYgr6xUAakZ7rC19CuOq1/yVUciieU1rzZZOWX8upaVPF +xHTBnpUakYjMesqwaN+oMit5hY9rs9S+efPTBDwU/JOQlSy7GG2mrTgP9SeO6HsU +ImINWZCyeoYFqqcdyJ5e5+XPbrkaKPtXj6wZIQerwamEPr/Fv9QBfY3NfoIjSll0 +UD6Aoi57cp2fGre8LktMe13SHIZFDIcUqp8AENN8FQRqRY6X/tZrnfyzOkpNKa7p +NWBaWAfYQFCg3yl3fv5M9UI1hoNH+MTrBcMxFnon8XWWZr0OfXLlMk4Yw1dqYAwN +GdsjuE//wMA+RAXoez1kA9FVdDWZwvneHDVIAv1QmQKBgQDhjoAc//k7uRxZzP+n +0Cg30wlFlDpEyHwGOtjOgbr0MFyC6JzPF5LVqgrf3WpAb5ubCsJBhz98C5aQromm +aioYFW5pNW7JPZiUOPKxNH5qUkcg8SwEo1bLAyH+HdgkTrbdhHm68kiFTZ0jNpRO +Qk19d7V6Wm1ZS7YUr03PyLF+jwKBgQDB4cp20rAkjVQOpf75unwvhagCnlBSkNaZ +ag93LgqMr3Mjd8ry6CI7c2q78M2oKfH7GVnSu6sI7CuWIte/Y+aUQPtVrSM6UCId +makKrbAxXrp2uAP58i/KFXKM08lQyepy8fvqc658+jLmH3KOYH0C6OvGVQGx7/13 +e4Jl12l+JwKBgDGkg13emKQkYbECBWKR1cgzkl7V+N0aovFcEkuhEdycqD/HonuR +3KdZ/Xq36KK17bF59LcnZTmP81t0jqcpxon2bY6KTA/Olr5IqmGGBCyyXyVI7z82 +E+wqjFi5iNC04lpuxbv3hy6Pnn4ZjRqMTTHIHxEGxfpZR4HV83I/4ZDRAoGAVY/J +g+qy5U6he91xys+romU/ofgvxmA49HdD3/qnmTKMg2iIXe5nvQjQX6SDfeUU7xVe ++IrtjgB7s8QopkP2LBMJV+QSmddnVtzLJvVDvmXpsB7BUnq48FvKs697NnYFSzjT +TcJDjM/1ymyyZ3bZdIFKG7rEBry8hRAymbMY0R0CgYEAsPstrOXtDzCTvE7vJ6kR +0tH2wKCU0T5eaIw6mfaei97lNbkbuHmm1dmd22sdilbkr+uNa+bijTiRpdDfq7RK +MAVdO/mMnfVNZ4EmiNyFw+rGeCDzWfK7vd9tvPY/yNzNa48getlE4BWfgHUo4MlO +RLjGDDx+dgHCt5N1/PFG8Rg= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIID3DCCAsSgAwIBAgIJALmxhUtWqs9XMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD +VQQGEwJERTEPMA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xDjAMBgNV +BAoTBUJyZWhtMRYwFAYDVQQLEw1CcmVobSBTU0wgS2V5MSEwHwYDVQQDExhlZ3Jv +dXB3YXJlLnVodS1iYW5hbmUuZGUxJTAjBgkqhkiG9w0BCQEWFmZyYW5rQGJyZWht +LW9ubGluZS5jb20wHhcNMTIxMjE5MjI1MDA0WhcNMTgwMjA2MjI1MDA0WjCBoTEL +MAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMQ4w +DAYDVQQKEwVCcmVobTEWMBQGA1UECxMNQnJlaG0gU1NMIEtleTEhMB8GA1UEAxMY +ZWdyb3Vwd2FyZS51aHUtYmFuYW5lLmRlMSUwIwYJKoZIhvcNAQkBFhZmcmFua0Bi +cmVobS1vbmxpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +qtNfN5jf5rEfjfKQzh836rvJqFik8xBP7teO/Uchc4hfOxRWNq8jo/Ogd/FgFXPw +tmzWzbzK8vn1WLmJmofGIF97bLNMaWqB56BC862KCgEzuMUZaTGIwQVZzXpObiYj +MFBOU6mm2xu0OqpKfgZgMO4WBqSLcCkr6L74HuyBncmhN8Q0yfUjPyMCL1XZUtRk +H/y3RffddLX8QgOjDMBurbH/jF07k7MDuUOUT+Vxk6jbd/vKKRhys595+M2QD0Bb +BElXRpizXa9lMSiOLB32r0m1JYdrNf4q9UsSnEH7MpBVm3/TL2gAjpFK0zCc941B +l/+29Nkpl39yyA3w8PupyQIDAQABoxUwEzARBglghkgBhvhCAQEEBAMCBkAwDQYJ +KoZIhvcNAQEFBQADggEBADlGTIWY1Uv1PQjoGFrynT1gQ8DT4oI6bAIErHhKCLUu +XtDtkcRCxNDih/qZky++BlYTTQta0VU7240aDBtfymUk7nPJvVBokEXTgUIxlqvX +twXbWNp7XbCdl/6YcNgt5OOBuSPV4NFAVmhVPFToloTs6rp33UKhcgjCL8uYPeGr +1EUNGrTaqcUumRz6dgjViZGnJEYo4yLgoCrcwLOlMru45s08I13xis8i9U3f/bV0 +ZItdsAxNIhzIPcKZvPQ8DXovIukVPbqLYns5kA4RkKitScT3oKGLfIHuRdh6pp+t +7fCNLDJFGPf9yLU+a6OqtyxsiQ3pE97xIttmWj7YDnQ= +-----END CERTIFICATE----- +-----BEGIN DH PARAMETERS----- +MEYCQQCwZ10gGhx2NuhcQi9bSQNTOzfJdBLmV5UdU9nuNI4cmSBoaAefpK71iXxp +Qw1hOJYBqrqmQgQPDH+4p/sv6rsjAgEC +-----END DH PARAMETERS----- diff --git a/apache2/vhosts.d/00_default_ssl_vhost.conf b/apache2/vhosts.d/00_default_ssl_vhost.conf index 98bfc2f..a0b95e1 100644 --- a/apache2/vhosts.d/00_default_ssl_vhost.conf +++ b/apache2/vhosts.d/00_default_ssl_vhost.conf @@ -8,13 +8,17 @@ # Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443" Listen 443 +# Use name-based virtual hosting. +NameVirtualHost *:443 + - ServerName localhost + ServerName www.uhu-banane.de Include /etc/apache2/vhosts.d/default_vhost.include - ErrorLog /var/log/apache2/ssl_error_log + ErrorLog /var/log/apache2/ssl_error.log - TransferLog /var/log/apache2/ssl_access_log + #TransferLog /var/log/apache2/ssl_access_log + CustomLog /var/log/apache2/ssl_access.log full ## SSL Engine Switch: @@ -32,14 +36,16 @@ Listen 443 # kill -HUP will prompt again. Keep in mind that if you have both an RSA # and a DSA certificate you can configure both in parallel (to also allow # the use of DSA ciphers, etc.) - SSLCertificateFile /etc/ssl/apache2/server.crt + #SSLCertificateFile /etc/ssl/apache2/server.crt + SSLCertificateFile /etc/apache2/ssl/egroupware-cert.pem ## Server Private Key: # If the key is not combined with the certificate, use this directive to # point at the key file. Keep in mind that if you've both a RSA and a DSA # private key you can configure both in parallel (to also allow the use of # DSA ciphers, etc.) - SSLCertificateKeyFile /etc/ssl/apache2/server.key + #SSLCertificateKeyFile /etc/ssl/apache2/server.key + SSLCertificateKeyFile /etc/apache2/ssl/egroupware-cert.pem ## Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the concatenation of @@ -168,7 +174,7 @@ Listen 443 # The home of a custom SSL log file. Use this when you want a compact # non-error SSL logfile on a virtual host basis. - CustomLog /var/log/apache2/ssl_request_log \ + CustomLog /var/log/apache2/ssl_request.log \ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" diff --git a/apache2/vhosts.d/00_default_vhost.conf b/apache2/vhosts.d/00_default_vhost.conf index 9fa425a..2b46233 100644 --- a/apache2/vhosts.d/00_default_vhost.conf +++ b/apache2/vhosts.d/00_default_vhost.conf @@ -36,7 +36,7 @@ NameVirtualHost *:80 # /etc/conf.d/apache2, the first defined virtual host elsewhere will be # the default. - ServerName localhost + ServerName www.uhu-banane.de Include /etc/apache2/vhosts.d/default_vhost.include diff --git a/apache2/vhosts.d/01_egroupware.conf b/apache2/vhosts.d/01_egroupware.conf new file mode 100644 index 0000000..1533dd7 --- /dev/null +++ b/apache2/vhosts.d/01_egroupware.conf @@ -0,0 +1,110 @@ + + + + + + + SSLEngine on + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + SSLCertificateFile /etc/apache2/ssl/egroupware-cert.pem + SSLCertificateKeyFile /etc/apache2/ssl/egroupware-cert.pem + + SSLOptions +StdEnvVars + + + + SSLOptions +StdEnvVars + + + + BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + + + ServerName egroupware.uhu-banane.de + + DocumentRoot /var/www/egroupware/htdocs + + ErrorLog /var/log/apache2/egroupware-error.log + LogLevel info + CustomLog /var/log/apache2/egroupware-access.log full + + + php_admin_flag engine on + php_admin_flag magic_quotes_gpc off + php_admin_flag safe_mode off + php_admin_flag display_errors off + php_admin_flag log_errors on + php_admin_value error_reporting "E_ALL & ~E_NOTICE" + + + + Options Indexes FollowSymLinks + AllowOverride All + Order allow,deny + Allow from all + + + + + + + SSLEngine on + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + SSLCertificateFile /etc/apache2/ssl/egroupware-cert.pem + SSLCertificateKeyFile /etc/apache2/ssl/egroupware-cert.pem + + SSLOptions +StdEnvVars + + + + SSLOptions +StdEnvVars + + + + BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + + + ServerName egroupware.brehm-online.com + ServerAlias egroupware + ServerAlias egroupware.brehm-berlin.eu + ServerAlias egroupware.brehm-berlin.de + ServerAlias egroupware.hennig-berlin.org + ServerAlias egroupware.uhu-banane.com + + DocumentRoot /var/www/egroupware/htdocs + + Redirect permanent / https://egroupware.uhu-banane.de/ + + ErrorLog /var/log/apache2/egroupware-error.log + LogLevel info + CustomLog /var/log/apache2/egroupware-access-redirect.log full + + + + + + + + + + ServerName egroupware.uhu-banane.de + ServerAlias egroupware + ServerAlias egroupware.brehm-online.com + ServerAlias egroupware.brehm-berlin.eu + ServerAlias egroupware.brehm-berlin.de + ServerAlias egroupware.hennig-berlin.org + ServerAlias egroupware.uhu-banane.com + + DocumentRoot /var/www/egroupware/htdocs + + Redirect permanent / https://egroupware.uhu-banane.de/ + + ErrorLog /var/log/apache2/egroupware-error.log + LogLevel info + CustomLog /var/log/apache2/egroupware-access-redirect.log full + + + + + +# vim: ts=4 filetype=apache diff --git a/apache2/vhosts.d/default_vhost.include b/apache2/vhosts.d/default_vhost.include index 6d45888..61282a6 100644 --- a/apache2/vhosts.d/default_vhost.include +++ b/apache2/vhosts.d/default_vhost.include @@ -1,7 +1,7 @@ # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com -ServerAdmin root@localhost +ServerAdmin frank@brehm-online.com # DocumentRoot: The directory out of which you will serve your # documents. By default, all requests are taken from this directory, but diff --git a/conf.d/apache2 b/conf.d/apache2 index 5ada27e..4996ace 100644 --- a/conf.d/apache2 +++ b/conf.d/apache2 @@ -33,7 +33,8 @@ # SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this # when you enable SSL) # -APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D MANUAL -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE" +#APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D MANUAL -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE" +APACHE2_OPTS="-D DEFAULT_VHOST -D PHP5 -D SSL -D SSL_DEFAULT_VHOST -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE" # Extended options for advanced uses of Apache ONLY # You don't need to edit these unless you are doing crazy Apache stuff @@ -57,7 +58,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D MANUAL -D SSL -D SSL_DEFAULT_VHOST -D # Location to log startup errors to # They are normally dumped to your terminal. -#STARTUPERRORLOG="/var/log/apache2/startuperror.log" +STARTUPERRORLOG="/var/log/apache2/startuperror.log" # A command that outputs a formatted text version of the HTML at the URL # of the command line. Designed for lynx, however other programs may work. diff --git a/pear.conf b/pear.conf new file mode 100644 index 0000000..d255cc5 --- /dev/null +++ b/pear.conf @@ -0,0 +1,2 @@ +#PEAR_Config 0.9 +a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:12:"/usr/bin/php";s:9:"cache_dir";s:15:"/var/cache/pear";s:12:"download_dir";s:13:"/var/tmp/pear";s:8:"temp_dir";s:4:"/tmp";} diff --git a/php/apache2-php5.3/php.ini b/php/apache2-php5.3/php.ini index 24e78a6..9eb30fa 100644 --- a/php/apache2-php5.3/php.ini +++ b/php/apache2-php5.3/php.ini @@ -1006,6 +1006,7 @@ default_socket_timeout = 60 ; Defines the default timezone used by the date functions ; http://php.net/date.timezone ;date.timezone = +date.timezone = Europe/Berlin ; http://php.net/date.default-latitude ;date.default_latitude = 31.7667 @@ -1813,6 +1814,7 @@ mssql.secure_connection = Off ; 4: Overload ereg*() functions ; http://php.net/mbstring.func-overload ;mbstring.func_overload = 0 +mbstring.func_overload = 7 ; enable strict encoding detection. ;mbstring.strict_detection = Off diff --git a/php/cli-php5.3/php.ini b/php/cli-php5.3/php.ini index 24e78a6..9eb30fa 100644 --- a/php/cli-php5.3/php.ini +++ b/php/cli-php5.3/php.ini @@ -1006,6 +1006,7 @@ default_socket_timeout = 60 ; Defines the default timezone used by the date functions ; http://php.net/date.timezone ;date.timezone = +date.timezone = Europe/Berlin ; http://php.net/date.default-latitude ;date.default_latitude = 31.7667 @@ -1813,6 +1814,7 @@ mssql.secure_connection = Off ; 4: Overload ereg*() functions ; http://php.net/mbstring.func-overload ;mbstring.func_overload = 0 +mbstring.func_overload = 7 ; enable strict encoding detection. ;mbstring.strict_detection = Off diff --git a/portage/package.keywords b/portage/package.keywords index 9bb9f0b..9e03ece 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -213,6 +213,8 @@ ~dev-perl/WWW-Pastebin-PastebinCom-Create-0.4.0 ~dev-perl/YAML-LibYAML-0.350.0 +~dev-php/PEAR-XML_Feed_Parser-1.0.5 + dev-python/fbrehm-libs ~dev-python/msgpack-0.1.12 diff --git a/portage/package.use b/portage/package.use index 54cebfe..b548b35 100644 --- a/portage/package.use +++ b/portage/package.use @@ -36,7 +36,7 @@ dev-java/blackdown-jdk -doc dev-java/sun-jdk jce dev-lang/perl perlsuid -dev-lang/php bcmath calendar cgi cli ctype curlwrappers dbase embed enchant exif filter flatfile fpm gd gd-external hash iconv imap inifile intl json ldap-sasl mhash mysqli mysqlnd pcntl pdo-external posix -recode sharedext sharedmem simplexml sockets spl suhosin sysvipc -threads tidy tokenizer wddx xmlreader xmlwriter -xpm yaz zip +dev-lang/php bcmath calendar cgi cli ctype curlwrappers dbase embed enchant exif filter flatfile fpm gd gd-external hash iconv imap inifile intl json ldap-sasl mhash mysqli mysqlnd pcntl pdo pdo-external posix -recode sharedext sharedmem simplexml sockets spl suhosin sysvipc -threads tidy tokenizer wddx xmlreader xmlwriter -xpm yaz zip dev-libs/cyrus-sasl authdaemond -java dev-libs/geoip perl-geoipupdate static-libs @@ -161,11 +161,12 @@ sys-libs/pam audit sys-fs/quota rpc sys-fs/udev devfs-compat edd extras hwdb +www-apps/egroupware gallery www-apps/trac i18n www-client/elinks -samba -x11-libs/libXi -doc - www-servers/apache sni suexec -threads +x11-libs/libXi -doc + diff --git a/runlevels/default/apache2 b/runlevels/default/apache2 new file mode 120000 index 0000000..0d96476 --- /dev/null +++ b/runlevels/default/apache2 @@ -0,0 +1 @@ +/etc/init.d/apache2 \ No newline at end of file -- 2.39.5