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 --- DEV/install.sh | 17 +- LICENSE | 340 ------------------------ README | 186 ------------- TODO | 2 - TODO_FIX_INCLUDES | 5 - 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 - services/cron_dect.php | 12 +- services/dect_clear.php | 6 +- services/jabberserver.php | 6 +- txt/LICENSE | 340 ++++++++++++++++++++++++ txt/README | 187 +++++++++++++ txt/TODO | 4 + txt/TODO_FIX_INCLUDES | 5 + 27 files changed, 718 insertions(+), 714 deletions(-) delete mode 100755 LICENSE delete mode 100644 README delete mode 100644 TODO delete mode 100644 TODO_FIX_INCLUDES 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 create mode 100755 txt/LICENSE create mode 100644 txt/README create mode 100644 txt/TODO create mode 100644 txt/TODO_FIX_INCLUDES 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/ - - 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 + 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_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/LICENSE b/LICENSE deleted file mode 100755 index b722224c..00000000 --- a/LICENSE +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/README b/README deleted file mode 100644 index 23c718c9..00000000 --- a/README +++ /dev/null @@ -1,186 +0,0 @@ -DIRS: ------ -./DB - Standart DB File -./www - daten für http verbindung -./www-ssl - daten für https verbindung - -Anfordeungen: -------------- - PHP 4.xx - -Systemconfig: -------------- -./www-ssl/inc/config.php - algemeien einstellungen -./www-ssl/inc/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 - date.timezone = Europe/Berlin -Engelsystem Setup-Guide - -1. Installation des Grundsystems: -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 - -1.2. Configuration von apache2: -Erstellen von http und https http-root: - mkdir /var/www/http/ - mkdir /var/www/https/ -Erstellen der SSL-Certifikate: - mkdir /etc/apache2/ssl/ - openssl req $@ -new -x509 -days 365 -nodes -out \ - /etc/apache2/ssl/apache.pem -keyout /etc/apache2/apache.pem - -Ausgabe: - Generating a 1024 bit RSA private key - writing new private key to ?/etc/apache2/ssl/apache.pem? - ... - Country Name (2 letter code) [AU]: DE - State or Province Name (full name) [Some-State]: B - Locality Name (eg, city): Berlin - Organization Name (eg, company) [Internet Widgits Pty Ltd]: CCC e.V. - Organizational Unit Name (eg, section): Angels - Common Name (eg, YOUR name): $server_url - Email Address: $admin_mail -Dann: - chmod 600 /etc/apache2/ssl/apache.pem - -Apache2 Configs: - /etc/apache2/sites-available/default: - -NameVirtualHost *:80 - - ServerAdmin webmaster@localhost - - DocumentRoot /var/www/http/ - - 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 - - - - - /etc/apache2/sites-available/https: - - - # SSL (START) - SSLEngine on - SSLCertificateFile /etc/apache2/ssl/apache.pem - SSLCertificateKeyFile /etc/apache2/apache.pem - - # SSL (ENDE) - ServerAdmin ichdasich@jabber.ccc.de - - #kann auch einfach eine IP sein - ServerName localhost - DocumentRoot /var/www/https - - Order Deny,Allow - Allow from all - # Zeige keine Verzeichnisse an - Options -Indexes - AddDefaultCharset ISO-8859-1 - - - - /etc/apache2/ports.conf: - -Listen 80 -Listen 443 - -Dann: - a2enmod ssl - a2ensite https - /etc/init.d/apache2 restart - -1.3. MySQL configurieren: -MySQL-Passwort fuer root setzen: - mysql -u root mysql - UPDATE user SET Password=PASSWORD('neues_passwort') WHERE user='root'; - mysql> FLUSH PRIVILEGES; - mysql -u root -p - mysql> CREATE DATABASE tabel; - -2. Engelsystem besorgen und installieren: - -2.1. Auschecken aus dem SVN: - cd /root/ - svn co svn://svn.cccv.de/engel-system - -2.2. Kopieren der Dateien ins http/s-root: - cp /root/engel-system/www/* /var/www/http/ - cp /root/engel-system/www-ssl/* /var/www/https/ - cp /root/engel-system/default-conf/www-ssl/inc/ /var/www/https/ - -2.3. Bearbeiten der Configurationsdatein: - vim /var/www/https/inc/config_db.php - -> Daten entsprechend anpassen - vim /var/www/https/inc/config.php - $url: url des servers - $ENGEL_ROOT = "/"; -2.4. Einfuegen der Datenbanken: - mysql tabel -u root -ppassword < ChangeLog.sql - mysql tabel -u root -ppassword < Himmel.sql - mysql tabel -u root -ppassword < Messages.sql - mysql tabel -u root -ppassword < Sprache.sql - mysql tabel -u root -ppassword < User.sql - mysql tabel -u root -ppassword < UserCVS.sql - mysql tabel -u root -ppassword < UserPicture.sql - -3. Das Engelsystem an sich: - -3.1. User und Passwoerter: -Das System sollte nun funktionieren. Einloggen kann man sich mit 'admin:admin' -(aendern nicht vergessen ;-)). Es sollte sich dir dann die Adminoberflaeche des -Systems zeigen. - -3.2. Importieren der DB fuer die Conference: -Unter UpdateDB koennt ihr den aktuellen Plan fuer die jewl. Conference -importieren. Dazu braucht ihr einen Pentabarfaccount. Falls das nicht klappt, -fragt cookie, ich hab das auch noch nie gemacht. 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/TODO_FIX_INCLUDES b/TODO_FIX_INCLUDES deleted file mode 100644 index f50844e7..00000000 --- a/TODO_FIX_INCLUDES +++ /dev/null @@ -1,5 +0,0 @@ -find . -name \*.php -exec grep -l './inc' {} \; - - -todo: -change installscript to place inc outside of http-root. exactly ONE dir ahead. 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 @@ - 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/txt/LICENSE b/txt/LICENSE new file mode 100755 index 00000000..b722224c --- /dev/null +++ b/txt/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/txt/README b/txt/README new file mode 100644 index 00000000..30225bca --- /dev/null +++ b/txt/README @@ -0,0 +1,187 @@ +DIRS: +----- +./DB + Standart DB File +./www + daten für http verbindung +./www-ssl + daten für https verbindung + +Anfordeungen: +------------- + PHP 5.xx + mysql >=4.0 + +Systemconfig: +------------- +../includes/config.php + algemeien einstellungen +../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 ## deprecated, ought be removed + date.timezone = Europe/Berlin +Engelsystem Setup-Guide + +1. Installation des Grundsystems: +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 php5-mysql \ + libapache2-mod-php5 subversion openssl ssl-cert + +1.2. Configuration von apache2: +Erstellen von http und https http-root: + mkdir /var/www/http/ + mkdir /var/www/https/ +Erstellen der SSL-Certifikate: + mkdir /etc/apache2/ssl/ + openssl req $@ -new -x509 -days 365 -nodes -out \ + /etc/apache2/ssl/apache.pem -keyout /etc/apache2/apache.pem + +Ausgabe: + Generating a 1024 bit RSA private key + writing new private key to ?/etc/apache2/ssl/apache.pem? + ... + Country Name (2 letter code) [AU]: DE + State or Province Name (full name) [Some-State]: B + Locality Name (eg, city): Berlin + Organization Name (eg, company) [Internet Widgits Pty Ltd]: CCC e.V. + Organizational Unit Name (eg, section): Angels + Common Name (eg, YOUR name): $server_url + Email Address: $admin_mail +Dann: + chmod 600 /etc/apache2/ssl/apache.pem + +Apache2 Configs: + /etc/apache2/sites-available/default: + +NameVirtualHost *:80 + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www/http/ + + 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 + + + + + /etc/apache2/sites-available/https: + + + # SSL (START) + SSLEngine on + SSLCertificateFile /etc/apache2/ssl/apache.pem + SSLCertificateKeyFile /etc/apache2/apache.pem + + # SSL (ENDE) + ServerAdmin ichdasich@jabber.ccc.de + + #kann auch einfach eine IP sein + ServerName localhost + DocumentRoot /var/www/https + + Order Deny,Allow + Allow from all + # Zeige keine Verzeichnisse an + Options -Indexes + AddDefaultCharset ISO-8859-1 + + + + /etc/apache2/ports.conf: + +Listen 80 +Listen 443 + +Dann: + a2enmod ssl + a2ensite https + /etc/init.d/apache2 restart + +1.3. MySQL configurieren: +MySQL-Passwort fuer root setzen: + mysql -u root mysql + UPDATE user SET Password=PASSWORD('neues_passwort') WHERE user='root'; + mysql> FLUSH PRIVILEGES; + mysql -u root -p + mysql> CREATE DATABASE tabel; + +2. Engelsystem besorgen und installieren: + +2.1. Auschecken aus dem SVN: + cd /root/ + svn co svn://svn.cccv.de/engel-system + +2.2. Kopieren der Dateien ins http/s-root: + cp /root/engel-system/www/* /var/www/http/ + cp /root/engel-system/www-ssl/* /var/www/https/ + cp /root/engel-system/default-conf/www-ssl/inc/ /var/www/https/ + +2.3. Bearbeiten der Configurationsdatein: + vim /var/www/https/inc/config_db.php + -> Daten entsprechend anpassen + vim /var/www/https/inc/config.php + $url: url des servers + $ENGEL_ROOT = "/"; +2.4. Einfuegen der Datenbanken: + mysql tabel -u root -ppassword < ChangeLog.sql + mysql tabel -u root -ppassword < Himmel.sql + mysql tabel -u root -ppassword < Messages.sql + mysql tabel -u root -ppassword < Sprache.sql + mysql tabel -u root -ppassword < User.sql + mysql tabel -u root -ppassword < UserCVS.sql + mysql tabel -u root -ppassword < UserPicture.sql + +3. Das Engelsystem an sich: + +3.1. User und Passwoerter: +Das System sollte nun funktionieren. Einloggen kann man sich mit 'admin:admin' +(aendern nicht vergessen ;-)). Es sollte sich dir dann die Adminoberflaeche des +Systems zeigen. + +3.2. Importieren der DB fuer die Conference: +Unter UpdateDB koennt ihr den aktuellen Plan fuer die jewl. Conference +importieren. Dazu braucht ihr einen Pentabarfaccount. Falls das nicht klappt, +fragt cookie, ich hab das auch noch nie gemacht. 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/txt/TODO_FIX_INCLUDES b/txt/TODO_FIX_INCLUDES new file mode 100644 index 00000000..f50844e7 --- /dev/null +++ b/txt/TODO_FIX_INCLUDES @@ -0,0 +1,5 @@ +find . -name \*.php -exec grep -l './inc' {} \; + + +todo: +change installscript to place inc outside of http-root. exactly ONE dir ahead. -- cgit v1.3.1