From e9565a79eaa6b23bbf530dd8611feb1f170be781 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Tue, 3 Dec 2013 16:18:22 +0100 Subject: simplified config --- install/default-conf/config.php | 69 --------------------------------- install/default-conf/config_db.php | 9 ----- install/default-conf/etc/apache/default | 47 ---------------------- install/default-conf/etc/apache/https | 19 --------- install/default-conf/etc/crontab | 1 - install/default-conf/etc/festival.scm | 17 -------- 6 files changed, 162 deletions(-) delete mode 100644 install/default-conf/config.php delete mode 100644 install/default-conf/config_db.php delete mode 100644 install/default-conf/etc/apache/default delete mode 100644 install/default-conf/etc/apache/https delete mode 100644 install/default-conf/etc/crontab delete mode 100644 install/default-conf/etc/festival.scm (limited to 'install/default-conf') diff --git a/install/default-conf/config.php b/install/default-conf/config.php deleted file mode 100644 index 958db3ce..00000000 --- a/install/default-conf/config.php +++ /dev/null @@ -1,69 +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-Algorismus (entsprechend der Dokumentation von crypt()). -// Falls ein Benutzerpasswort in einem anderen Format gespeichert ist, -// wird es bei der ersten Benutzung des Klartext-Passworts in das neue Format -// konvertiert. -//define('CRYPT_ALG', '$1'); // MD5 -//define('CRYPT_ALG', '$2y$13'); // Blowfish -//define('CRYPT_ALG', '$5$rounds=5000'); // SHA-256 -define('CRYPT_ALG', '$6$rounds=5000'); // SHA-512 - -define('MIN_PASSWORD_LENGTH', 8); - -// Wenn Engel beim Registrieren oder in ihrem Profil eine T-Shirt Größe angeben sollen, auf true setzen: -$enable_tshirt_size = false; - -// timezonen offsett -$gmdateOffset=3600; - -// für Developen 1, sonst = 0 -$debug = 0; - -//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"; - -//Mailing List: is is not defined, the option is not shown -//$SubscribeMailinglist = "*-subscribe@lists.*"; - -/// Passord for external Authorization, function only active if the var is defined -//$CurrentExternAuthPass = 23; - -// multiply "night shifts" (start or end between 2 and 6 exclusive) by 2 -$shift_sum_formula = "SUM( - (1+( - (HOUR(FROM_UNIXTIME(`Shifts`.`end`)) > 2 AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) < 6) - OR (HOUR(FROM_UNIXTIME(`Shifts`.`start`)) > 2 AND HOUR(FROM_UNIXTIME(`Shifts`.`start`)) < 6) - OR (HOUR(FROM_UNIXTIME(`Shifts`.`start`)) <= 2 AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) >= 6) - ))*(`Shifts`.`end` - `Shifts`.`start`) -)"; - -// weigh every shift the same -//$shift_sum_formula = "SUM(`end` - `start`)"; - -// For accessing stats -$api_key = ""; - -?> diff --git a/install/default-conf/config_db.php b/install/default-conf/config_db.php deleted file mode 100644 index d07529c0..00000000 --- a/install/default-conf/config_db.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/install/default-conf/etc/apache/default b/install/default-conf/etc/apache/default deleted file mode 100644 index 49e60ba1..00000000 --- a/install/default-conf/etc/apache/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/install/default-conf/etc/apache/https b/install/default-conf/etc/apache/https deleted file mode 100644 index aaa0bf3f..00000000 --- a/install/default-conf/etc/apache/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/install/default-conf/etc/crontab b/install/default-conf/etc/crontab deleted file mode 100644 index d58671bc..00000000 --- a/install/default-conf/etc/crontab +++ /dev/null @@ -1 +0,0 @@ -*/15 * * * * www-data (cd /var/www/services/ ; php5 cron_dect.php) diff --git a/install/default-conf/etc/festival.scm b/install/default-conf/etc/festival.scm deleted file mode 100644 index d39be33e..00000000 --- a/install/default-conf/etc/festival.scm +++ /dev/null @@ -1,17 +0,0 @@ -;; Any site-wide Festival initialization can be added to this file. -;; It is marked as a configuration file, so your changes will be saved -;; across upgrades of the Festival package. -;; - - -; Server access list (hosts) -(set! server_access_list '("[^.]+" "127.0.0.1" "localhost.*")) - -;; Command for Asterisk begin -(define (tts_textasterisk string mode) - "(tts_textasterisk STRING MODE) - Apply tts to STRING. This function is specifically designed for - use in server mode so a single function call may synthesize the string. - This function name may be added to the server safe functions." - (utt.send.wave.client (utt.wave.resample (utt.wave.rescale (utt.synth (eval (list 'Utterance 'Text string))) 5) 8000))) - -- cgit v1.2.3-54-g00ecf