From cc2f90cb81e13ce0e13ce75bafbfce3acfdaca15 Mon Sep 17 00:00:00 2001 From: ichdasich Date: Wed, 8 Oct 2008 10:34:19 +0000 Subject: [PATCH] minor changes git-svn-id: svn://svn.cccv.de/engel-system@304 29ba0400-6e00-0410-a75a-ca02368028f8 --- DEV/install.sh | 17 +++++++++-------- TODO | 2 -- default-conf/etc/{ => apache}/default | 0 default-conf/etc/{ => apache}/https | 0 default-conf/etc/crontab | 2 +- .../inc => var_www_includes}/config.php | 0 .../inc => var_www_includes}/config_IAX.php | 0 .../inc => var_www_includes}/config_db.php | 0 .../inc => var_www_includes}/config_jabber.php | 0 .../inc => var_www_includes}/config_modem.php | 0 services/cron_dect.php | 12 ++++++------ services/dect_clear.php | 6 +++--- services/jabberserver.php | 6 +++--- LICENSE => txt/LICENSE | 0 README => txt/README | 13 +++++++------ txt/TODO | 4 ++++ TODO_FIX_INCLUDES => txt/TODO_FIX_INCLUDES | 0 17 files changed, 33 insertions(+), 29 deletions(-) delete mode 100644 TODO rename default-conf/etc/{ => apache}/default (100%) rename default-conf/etc/{ => apache}/https (100%) rename default-conf/{www-ssl/inc => var_www_includes}/config.php (100%) rename default-conf/{www-ssl/inc => var_www_includes}/config_IAX.php (100%) rename default-conf/{www-ssl/inc => var_www_includes}/config_db.php (100%) rename default-conf/{www-ssl/inc => var_www_includes}/config_jabber.php (100%) rename default-conf/{www-ssl/inc => var_www_includes}/config_modem.php (100%) rename LICENSE => txt/LICENSE (100%) rename README => txt/README (95%) create mode 100644 txt/TODO rename TODO_FIX_INCLUDES => txt/TODO_FIX_INCLUDES (100%) diff --git a/DEV/install.sh b/DEV/install.sh index 722f2eb9..baeed134 100644 --- a/DEV/install.sh +++ b/DEV/install.sh @@ -52,16 +52,17 @@ echo "setting up mysql" mysql -u root mysql -e "CREATE DATABASE tabel;" echo "setting sources in place" - cp -r `pwd`/engel-system/www/* /var/www/http/ + cp -r `pwd`/engel-system/www/* /var/www/http/ # meant to be removed cp -r `pwd`/engel-system/www-ssl/* /var/www/https/ cp -r `pwd`/engel-system/includes/ /var/www/ - cp -r `pwd`/engel-system/default-conf/www-ssl/inc/* /var/www/https/inc/ + cp -r `pwd`/engel-system/default-conf/var_www_includes/* /var/www/includes/ + cp -r `pwd`/engel-system/service/ /var/www/ + + rm /var/www/includes/config.php + cat `pwd`/engel-system/default-conf/var_www_includes/config.php|sed s/SEDENGELURL/$FQDN/ |sed s/MD5SED/`openssl x509 -noout -fingerprint -md5 -in /etc/apache2/ssl/apache.pem|sed s/MD5\ Fingerprint\=//`/|sed s/SHA1SED/`openssl x509 -noout -fingerprint -sha1 -in /etc/apache2/ssl/apache.pem|sed s/SHA1\ Fingerprint\=//`/ >> /var/www/includes/config.php - rm /var/www/https/inc/config.php - cat `pwd`/engel-system/default-conf/www-ssl/inc/config.php|sed s/SEDENGELURL/$FQDN/ |sed s/MD5SED/`openssl x509 -noout -fingerprint -md5 -in /etc/apache2/ssl/apache.pem|sed s/MD5\ Fingerprint\=//`/|sed s/SHA1SED/`openssl x509 -noout -fingerprint -sha1 -in /etc/apache2/ssl/apache.pem|sed s/SHA1\ Fingerprint\=//`/ >> /var/www/https/inc/config.php - - rm /var/www/https/inc/config_db.php - cat `pwd`/engel-system/default-conf/www-ssl/inc/config_db.php|sed s/changeme/$SQL_UPWD/|sed s/root/$SQL_USER/ >> /var/www/https/inc/config_db.php + rm /var/www/includes/config_db.php + cat `pwd`/engel-system/default-conf/var_www_includes/config_db.php|sed s/changeme/$SQL_UPWD/|sed s/root/$SQL_USER/ >> /var/www/includes/config_db.php cp `pwd`/engel-system/DB/User.sql `pwd`/engel-system/DB/User.sql2 rm `pwd`/engel-system/DB/User.sql @@ -99,5 +100,5 @@ echo "-the webfrontend user/pass combo is: admin:$ADM_PASSWD" echo "-the sql-server root account is: root:$SQL_PASSWD" echo "-the sql-server user account is: $SQL_USER:$SQL_UPWD" echo "-you can find further information and the passwords in /root/cfg.info" -echo "-make sure \$url in /var/www/https/inc/config.php is correct" +echo "-make sure \$url in /var/www/includes/config.php is correct" diff --git a/TODO b/TODO deleted file mode 100644 index 61361fb4..00000000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* schichten über monatsgrenzen einbauen - im moment werden die tag enur hochgezählt und die monatzgrenzen werden ignoriert diff --git a/default-conf/etc/default b/default-conf/etc/apache/default similarity index 100% rename from default-conf/etc/default rename to default-conf/etc/apache/default diff --git a/default-conf/etc/https b/default-conf/etc/apache/https similarity index 100% rename from default-conf/etc/https rename to default-conf/etc/apache/https 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/www-ssl/inc/config.php b/default-conf/var_www_includes/config.php similarity index 100% rename from default-conf/www-ssl/inc/config.php rename to default-conf/var_www_includes/config.php diff --git a/default-conf/www-ssl/inc/config_IAX.php b/default-conf/var_www_includes/config_IAX.php similarity index 100% rename from default-conf/www-ssl/inc/config_IAX.php rename to default-conf/var_www_includes/config_IAX.php diff --git a/default-conf/www-ssl/inc/config_db.php b/default-conf/var_www_includes/config_db.php similarity index 100% rename from default-conf/www-ssl/inc/config_db.php rename to default-conf/var_www_includes/config_db.php diff --git a/default-conf/www-ssl/inc/config_jabber.php b/default-conf/var_www_includes/config_jabber.php similarity index 100% rename from default-conf/www-ssl/inc/config_jabber.php rename to default-conf/var_www_includes/config_jabber.php diff --git a/default-conf/www-ssl/inc/config_modem.php b/default-conf/var_www_includes/config_modem.php similarity index 100% rename from default-conf/www-ssl/inc/config_modem.php rename to default-conf/var_www_includes/config_modem.php diff --git a/services/cron_dect.php b/services/cron_dect.php index fba53eb2..b5e338c6 100755 --- a/services/cron_dect.php +++ b/services/cron_dect.php @@ -1,11 +1,11 @@ ) -include ("./inc/db.php"); -include ("./inc/config.php"); -include ("./inc/funktion_modem.php"); +include ("../includes/db.php"); +include ("../includes/config.php"); +include ("../includes/funktion_modem.php"); $SQL = "SELECT DECT FROM `User`;"; diff --git a/services/jabberserver.php b/services/jabberserver.php index 35ddf6b3..8a80b35c 100755 --- a/services/jabberserver.php +++ b/services/jabberserver.php @@ -3,9 +3,9 @@ /****************************************************************************************************/ // INCLUDE /****************************************************************************************************/ -require_once('./inc/config_jabber.php'); -require_once("./inc/funktion_jabber.php"); -include("./inc/config_MessegeServer.php"); +require_once('../includes/config_jabber.php'); +require_once("../includes/funktion_jabber.php"); +include("../includes/config_MessegeServer.php"); // Set time limit to indefinite execution set_time_limit( 0 ); diff --git a/LICENSE b/txt/LICENSE similarity index 100% rename from LICENSE rename to txt/LICENSE diff --git a/README b/txt/README similarity index 95% rename from README rename to txt/README index 23c718c9..30225bca 100644 --- a/README +++ b/txt/README @@ -9,20 +9,21 @@ DIRS: Anfordeungen: ------------- - PHP 4.xx + PHP 5.xx + mysql >=4.0 Systemconfig: ------------- -./www-ssl/inc/config.php +../includes/config.php algemeien einstellungen -./www-ssl/inc/db.php +../includes/config_db.php einstellungen der DB Achtung: DB user braucht folgende Rechte: SELECT, CREATE, INSERT, ALTER, UPDATE, INDEX, DELETE, DROP php.ini: -------- add: - allow_url_fopen = On + allow_url_fopen = On ## deprecated, ought be removed date.timezone = Europe/Berlin Engelsystem Setup-Guide @@ -30,8 +31,8 @@ Engelsystem Setup-Guide Ich gehe in der Doku von Debian Etch mit Apache2, mysql5 und php4 aus. 1.1. Installieren der benoetigten Programme: - apt-get install vim apache2 mysql-common mysql-server php4-mysql \ - libapache2-mod-php4 subversion openssl ssl-cert + apt-get install vim apache2 mysql-common mysql-server php5-mysql \ + libapache2-mod-php5 subversion openssl ssl-cert 1.2. Configuration von apache2: Erstellen von http und https http-root: diff --git a/txt/TODO b/txt/TODO new file mode 100644 index 00000000..b949a94f --- /dev/null +++ b/txt/TODO @@ -0,0 +1,4 @@ +* schichten ueber monatsgrenzen einbaue im moment werden die tage nur + hochgezaehlt und die monatzgrenzen werden ignoriert +* veryfy use of dect_clear.php and jabberserver.php + diff --git a/TODO_FIX_INCLUDES b/txt/TODO_FIX_INCLUDES similarity index 100% rename from TODO_FIX_INCLUDES rename to txt/TODO_FIX_INCLUDES