diff options
| author | Philip Häusler <msquare@notrademark.de> | 2011-06-11 18:10:20 +0200 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2011-06-11 18:10:20 +0200 |
| commit | 49a20487e74aaa2fa17784c6c9d5a6179393e07c (patch) | |
| tree | 3ace8aa439becc53f7187367a425ab3be1099169 /default-conf/etc/apache | |
| parent | 946c230e6f8e04c7dd8f92ca3190a51ac220f0ca (diff) | |
move default-config to install dir
Diffstat (limited to 'default-conf/etc/apache')
| -rw-r--r-- | default-conf/etc/apache/default | 47 | ||||
| -rw-r--r-- | default-conf/etc/apache/https | 19 |
2 files changed, 0 insertions, 66 deletions
diff --git a/default-conf/etc/apache/default b/default-conf/etc/apache/default deleted file mode 100644 index 49e60ba1..00000000 --- a/default-conf/etc/apache/default +++ /dev/null @@ -1,47 +0,0 @@ -NameVirtualHost *:80 -<VirtualHost *:80> - ServerAdmin webmaster@localhost - - DocumentRoot /var/www/http/ - php_admin_value open_basedir "/var/www/" - <Directory /> - Options FollowSymLinks - AllowOverride None - </Directory> - <Directory /var/www/http/> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny - allow from all - # This directive allows us to have apache2's default start page - # in /apache2-default/, but still have / go to the right place - #RedirectMatch ^/$ /apache2-default/ - </Directory> - - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - <Directory "/usr/lib/cgi-bin"> - AllowOverride None - Options ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - </Directory> - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - ServerSignature On - - Alias /doc/ "/usr/share/doc/" - <Directory "/usr/share/doc/"> - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.0/255.0.0.0 ::1/128 - </Directory> - -</VirtualHost> diff --git a/default-conf/etc/apache/https b/default-conf/etc/apache/https deleted file mode 100644 index aaa0bf3f..00000000 --- a/default-conf/etc/apache/https +++ /dev/null @@ -1,19 +0,0 @@ - -<VirtualHost *:443> - # SSL (START) - SSLEngine on - SSLCertificateFile /etc/apache2/ssl/apache.pem - SSLCertificateKeyFile /etc/apache2/apache.pem - # SSL (ENDE) - ServerAdmin webmaster@localhost - #kann auch einfach eine IP sein - ServerName localhost - php_admin_value open_basedir "/var/www/" - DocumentRoot /var/www/https - <Directory /var/www/https> - Order Deny,Allow - Allow from all - # Zeige keine Verzeichnisse an - Options -Indexes - </Directory> -</VirtualHost> |