From cc2f90cb81e13ce0e13ce75bafbfce3acfdaca15 Mon Sep 17 00:00:00 2001
From: ichdasich <ichdasich@29ba0400-6e00-0410-a75a-ca02368028f8>
Date: Wed, 8 Oct 2008 10:34:19 +0000
Subject: minor changes

git-svn-id: svn://svn.cccv.de/engel-system@304 29ba0400-6e00-0410-a75a-ca02368028f8
---
 default-conf/etc/apache/default | 47 +++++++++++++++++++++++++++++++++++++++++
 default-conf/etc/apache/https   | 19 +++++++++++++++++
 default-conf/etc/crontab        |  2 +-
 default-conf/etc/default        | 47 -----------------------------------------
 default-conf/etc/https          | 19 -----------------
 5 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 default-conf/etc/apache/default
 create mode 100644 default-conf/etc/apache/https
 delete mode 100644 default-conf/etc/default
 delete mode 100644 default-conf/etc/https

(limited to 'default-conf/etc')

diff --git a/default-conf/etc/apache/default b/default-conf/etc/apache/default
new file mode 100644
index 00000000..49e60ba1
--- /dev/null
+++ b/default-conf/etc/apache/default
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 00000000..aaa0bf3f
--- /dev/null
+++ b/default-conf/etc/apache/https
@@ -0,0 +1,19 @@
+ 
+<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>
diff --git a/default-conf/etc/crontab b/default-conf/etc/crontab
index a63f1238..d58671bc 100644
--- a/default-conf/etc/crontab
+++ b/default-conf/etc/crontab
@@ -1 +1 @@
-*/15    * * * * www-data  (cd /home/engel-system/services ; php4 cron_dect.php)
+*/15    * * * * www-data  (cd /var/www/services/ ; php5 cron_dect.php)
diff --git a/default-conf/etc/default b/default-conf/etc/default
deleted file mode 100644
index 49e60ba1..00000000
--- a/default-conf/etc/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/https b/default-conf/etc/https
deleted file mode 100644
index aaa0bf3f..00000000
--- a/default-conf/etc/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>
-- 
cgit v1.2.3-70-g09d2