diff --git a/TODO.txt b/TODO.txt index a8f6000fe63d7dc1ad471086c007d83b6572ec78..fed7dd3dba9693706db79634b0607c258f9cf6a6 100644 --- a/TODO.txt +++ b/TODO.txt @@ -23,7 +23,7 @@ Server Mail module -------------------------------------- -- Show mail statistics in the interface. the mail statistics are stored +- Show mail statistics in the interface. The mail statistics are stored in the database table mail_traffic and are collected by the file server/cron_daily.php diff --git a/docs/CHROOTED_DEBIAN_5.0.txt b/docs/CHROOTED_DEBIAN_5.0.txt index d3f6cd1159730aff4aef6a152ba45c0e7d100e3d..94c734b376f67553b00d8e5fb0b60ff12564c89c 100644 --- a/docs/CHROOTED_DEBIAN_5.0.txt +++ b/docs/CHROOTED_DEBIAN_5.0.txt @@ -5,18 +5,18 @@ # dxr@brutalsec.net # 01-09-2009 # -# We can create a script for configure chroot enviroment but, +# We can create a script for configure chroot environment but, # YOU MUST UNDERSTAND HOW TO WORK IT for can solve possible # problems in the future. # -# Every service has its own chroot enviroment: +# Every service has its own chroot environment: # BIND -> chroot # Apache -> chroot # Dovecot -> chroot # Pureftpd -> Apache's chroot # # Only apache and php packages aren't installed in real system, -# only in chroot enviroment with symbolic links from real system. +# only in chroot environment with symbolic links from real system. # # PLEASE, CONFIGURE CHROOT ENVIROMENT IF SECURITY IS REALLY # IMPORTANT FOR YOU AND YOU KNOWN HOW TO WORK IT! @@ -24,10 +24,10 @@ exit 1 -1. BACKUP before change something in the system +1. BACKUP before changing anything on the system 2. Create partitions -3. Remove possible apache or php installations on real system -4. Prepair Chroot enviroment +3. Remove possible Apache or PHP installations on real system +4. Prepare Chroot environment 5. Linking Webserver aplication from real system 6. mini_sendmail 7. Test services @@ -35,8 +35,8 @@ exit 1 9. Migration -1. BACKUP before change something in the system -# If is not a new instalation, then +1. BACKUP before changing anything on the system +# If is not a new installation, then BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP @@ -62,12 +62,12 @@ mount /dev/lvm_foobar2/apachelogs_lv /var/www/html/var/log/apache2 mount /dev/lvm_foobar3/hosting_lv /var/www/html/var/www/html -3. Remove possible apache or php installations on real system -# We never wont install apache or php in non-chroot system, if we have installed, we only have do a backup of confgigurations, uninstall, and check every simbolic link +3. Remove possible Apache or PHP installations on real system +# We never wont install apache or php in non-chroot system, if we have installed, we only have do a backup of configurations, uninstall, and check every symbolic link dpkg -l|egrep --color -i 'apache|php' -4. Prepair Chroot enviroment +4. Prepare Chroot environment # Install packages in real system apt-get install debootstrap libpcre3 libaprutil1 libxml2 mime-support patch make gcc mysql-server subversion ssh openssh-server ntp ntpdate vim libdbd-mysql libdbi-perl dnsutils @@ -128,7 +128,7 @@ chown root:root /var/www/html/etc/apache2/ && chmod 700 /var/www/html/etc/apache chmod 711 /var/www/html/etc/php5/ -5. # Is good idea to add nagios alarm for check every simbolic link is correct. +5. # Is good idea to add Nagios alarm for check every symbolic link is correct. ln -s /var/www/html/etc/apache2 /etc/apache2 ln -s /var/www/html/etc/suphp /etc/suphp ln -s /var/www/html/var/run/apache2 /var/run/apache2 diff --git a/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt b/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt index 5263042827828777c583d05d20de2334d90b9331..df220aaca068db1279864ef1f5809990528c17f2 100644 --- a/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt +++ b/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt @@ -44,7 +44,7 @@ ln -s / www chroot /var/www -# Update files in the chroot enviroment and install some packages. +# Update files in the chroot environment and install some packages. # You can ignore warnings about locales, we will fix them in the next step. apt-get update @@ -104,7 +104,7 @@ cd /tmp/ rm -rf ispconfig3_install rm -f ISPConfig-3.0.1.4-beta-2.tar.gz -# Move the ispconfig interface part to the chroot enviroment and create a symlink +# Move the ispconfig interface part to the chroot environment and create a symlink mkdir /var/www/usr/local/ispconfig chown ispconfig:ispconfig /var/www/usr/local/ispconfig diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 8a56e1f262e195fe7266e567af041b23f88e70ff..e9cbc93e514e861722db23cedbf23cd704f963d2 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -40,7 +40,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - DOUBLE * - CURRENCY (Formats digits in currency notation) * - VARCHAR (No format check) -* - DATE (Date format, converts from and to linux timestamps automatically) +* - DATE (Date format, converts from and to UNIX timestamps automatically) * * Formtype: * - TEXT (Normal text field) @@ -1421,4 +1421,4 @@ class tform { } } -?> \ No newline at end of file +?>