From cc2f90cb81e13ce0e13ce75bafbfce3acfdaca15 Mon Sep 17 00:00:00 2001 From: ichdasich 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 --------- default-conf/var_www_includes/config.php | 51 +++++++++++++++++++++++++ default-conf/var_www_includes/config_IAX.php | 9 +++++ default-conf/var_www_includes/config_db.php | 6 +++ default-conf/var_www_includes/config_jabber.php | 17 +++++++++ default-conf/var_www_includes/config_modem.php | 11 ++++++ default-conf/www-ssl/inc/config.php | 51 ------------------------- default-conf/www-ssl/inc/config_IAX.php | 9 ----- default-conf/www-ssl/inc/config_db.php | 6 --- default-conf/www-ssl/inc/config_jabber.php | 17 --------- default-conf/www-ssl/inc/config_modem.php | 11 ------ 15 files changed, 161 insertions(+), 161 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 create mode 100755 default-conf/var_www_includes/config.php create mode 100644 default-conf/var_www_includes/config_IAX.php create mode 100755 default-conf/var_www_includes/config_db.php create mode 100755 default-conf/var_www_includes/config_jabber.php create mode 100644 default-conf/var_www_includes/config_modem.php delete mode 100755 default-conf/www-ssl/inc/config.php delete mode 100644 default-conf/www-ssl/inc/config_IAX.php delete mode 100755 default-conf/www-ssl/inc/config_db.php delete mode 100755 default-conf/www-ssl/inc/config_jabber.php delete mode 100644 default-conf/www-ssl/inc/config_modem.php (limited to 'default-conf') 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 + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www/http/ + php_admin_value open_basedir "/var/www/" + + Options FollowSymLinks + AllowOverride None + + + 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/ + + + ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + + + 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/" + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order deny,allow + Deny from all + Allow from 127.0.0.0/255.0.0.0 ::1/128 + + + 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 @@ + + + # 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 + + Order Deny,Allow + Allow from all + # Zeige keine Verzeichnisse an + Options -Indexes + + 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 - - ServerAdmin webmaster@localhost - - DocumentRoot /var/www/http/ - php_admin_value open_basedir "/var/www/" - - Options FollowSymLinks - AllowOverride None - - - 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/ - - - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - - AllowOverride None - Options ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - - - 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/" - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.0/255.0.0.0 ::1/128 - - - 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 @@ - - - # 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 - - Order Deny,Allow - Allow from all - # Zeige keine Verzeichnisse an - Options -Indexes - - diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php new file mode 100755 index 00000000..07d4fb03 --- /dev/null +++ b/default-conf/var_www_includes/config.php @@ -0,0 +1,51 @@ +This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room"; + +// Anzahl der News, die auf einer Seite ausgeben werden koennen... +$DISPLAY_NEWS = 6; + +// Anzahl Stunden bis zum Austragen eigener Schichten +$LETZTES_AUSTRAGEN=3; + +//Setzt den zu verwendenden Crypto algorismis +// mp5 oder crypt +// achtung crypt schaltet password ändern ab +$crypt_system="md5"; +//$crypt_system="crypt"; + +// the archangels +$arch_angels="fnord"; + +// timezonen offsett +$gmdateOffset=3600; + +// für Developen 1, sonst = 0 +$DEBUG = 0; + +// SSL Cert-KEY +$show_SSLCERT = "MD5:
MD5SED
\n". + "SHA1:
SHA1SED"; + +//globale const. fuer schischtplan +$GlobalZeileProStunde = 4; + +//Tempdir +$Tempdir="./tmp"; + +// local timezone +date_default_timezone_set("Europe/Berlin"); + +//Pentabarf ConferenzDI für UpdateDB +$PentabarfXMLhost = "cccv.pentabarf.org"; +$PentabarfXMLpath = "Xcal/conference/"; +$PentabarfXMLEventID = "31"; +$PentabarfGetWith = "fsockopen"; // "fsockopen"/"fopen"/"wget"/"lynx" + +?> diff --git a/default-conf/var_www_includes/config_IAX.php b/default-conf/var_www_includes/config_IAX.php new file mode 100644 index 00000000..f5bdeaeb --- /dev/null +++ b/default-conf/var_www_includes/config_IAX.php @@ -0,0 +1,9 @@ + diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php new file mode 100755 index 00000000..d959be90 --- /dev/null +++ b/default-conf/var_www_includes/config_db.php @@ -0,0 +1,6 @@ + diff --git a/default-conf/var_www_includes/config_jabber.php b/default-conf/var_www_includes/config_jabber.php new file mode 100755 index 00000000..13cd3538 --- /dev/null +++ b/default-conf/var_www_includes/config_jabber.php @@ -0,0 +1,17 @@ + diff --git a/default-conf/var_www_includes/config_modem.php b/default-conf/var_www_includes/config_modem.php new file mode 100644 index 00000000..0625936d --- /dev/null +++ b/default-conf/var_www_includes/config_modem.php @@ -0,0 +1,11 @@ + diff --git a/default-conf/www-ssl/inc/config.php b/default-conf/www-ssl/inc/config.php deleted file mode 100755 index 07d4fb03..00000000 --- a/default-conf/www-ssl/inc/config.php +++ /dev/null @@ -1,51 +0,0 @@ -This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room"; - -// Anzahl der News, die auf einer Seite ausgeben werden koennen... -$DISPLAY_NEWS = 6; - -// Anzahl Stunden bis zum Austragen eigener Schichten -$LETZTES_AUSTRAGEN=3; - -//Setzt den zu verwendenden Crypto algorismis -// mp5 oder crypt -// achtung crypt schaltet password ändern ab -$crypt_system="md5"; -//$crypt_system="crypt"; - -// the archangels -$arch_angels="fnord"; - -// timezonen offsett -$gmdateOffset=3600; - -// für Developen 1, sonst = 0 -$DEBUG = 0; - -// SSL Cert-KEY -$show_SSLCERT = "MD5:
MD5SED
\n". - "SHA1:
SHA1SED"; - -//globale const. fuer schischtplan -$GlobalZeileProStunde = 4; - -//Tempdir -$Tempdir="./tmp"; - -// local timezone -date_default_timezone_set("Europe/Berlin"); - -//Pentabarf ConferenzDI für UpdateDB -$PentabarfXMLhost = "cccv.pentabarf.org"; -$PentabarfXMLpath = "Xcal/conference/"; -$PentabarfXMLEventID = "31"; -$PentabarfGetWith = "fsockopen"; // "fsockopen"/"fopen"/"wget"/"lynx" - -?> diff --git a/default-conf/www-ssl/inc/config_IAX.php b/default-conf/www-ssl/inc/config_IAX.php deleted file mode 100644 index f5bdeaeb..00000000 --- a/default-conf/www-ssl/inc/config_IAX.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/default-conf/www-ssl/inc/config_db.php b/default-conf/www-ssl/inc/config_db.php deleted file mode 100755 index d959be90..00000000 --- a/default-conf/www-ssl/inc/config_db.php +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/default-conf/www-ssl/inc/config_jabber.php b/default-conf/www-ssl/inc/config_jabber.php deleted file mode 100755 index 13cd3538..00000000 --- a/default-conf/www-ssl/inc/config_jabber.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/default-conf/www-ssl/inc/config_modem.php b/default-conf/www-ssl/inc/config_modem.php deleted file mode 100644 index 0625936d..00000000 --- a/default-conf/www-ssl/inc/config_modem.php +++ /dev/null @@ -1,11 +0,0 @@ - -- cgit v1.2.3-54-g00ecf