diff --git a/build/deb/apache.conf b/build/deb/apache.conf index cfedcbc4dbb..d37b433fb98 100644 --- a/build/deb/apache.conf +++ b/build/deb/apache.conf @@ -13,10 +13,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # CustomLog logs/ldap.example.com-access.log common # -# Directory for web pages - - Order deny,allow - Allow from all + DirectoryIndex index.php Options +FollowSymLinks +Indexes @@ -56,23 +53,16 @@ Alias /dolibarr /usr/share/dolibarr/htdocs #ExpiresByType application/x-javascript A2592000 #ExpiresByType application/javascript A2592000 - + -# Directory for public pages - + AllowOverride All Order deny,allow Allow from all - + -# Directory for data files - + AllowOverride All Order deny,allow Allow from all - - - AllowOverride All - Order deny,allow - Allow from all - + diff --git a/build/deb/changelog b/build/deb/changelog index d75fd100a60..182110624de 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,4 +1,4 @@ -dolibarr 3.1.0 unstable; urgency=low + dolibarr 3.1.0 unstable; urgency=low * New 3.1.0 release More information into /usr/share/dolibarr/ChangeLog file. -- maintainer Laurent Destailleur 2011-07-09 \ No newline at end of file diff --git a/build/deb/control b/build/deb/control index 2d356fc7b2b..3f564f5608f 100644 --- a/build/deb/control +++ b/build/deb/control @@ -3,39 +3,35 @@ Version: __VERSION__ Architecture: all Maintainer: Laurent Destailleur Essential: no -Installed-Size: 61200 +Installed-Size: 31200 Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl Section: web Priority: optional -Recommends: firefox +Recommends: mozilla | netscape Homepage: http://www.dolibarr.org -Description: Easy to use ERP & CRM software to manage your activity. +Description: ERP & CRM software to manage your activity. Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship - Management (CRM) but also for different other activities. - It's a web software you can install as a standalone program or on any web - hosting provider to use it from anywhere with any web browser. - Dolibarr was designed to provide only features you need and be easy to use. + Management (CRM) but also other features for different activities. . - Only features you need are visible, depending on which module were activated. - Most common used modules are: + Dolibarr features are activated by modules. Most common modules are: . + * Products and services catalog + * Stock management + * Bank accounts management * Customers, Suppliers or Prospects directory * Contacts directory * Orders management * Commercial proposals management * Invoices management - * Products and services catalog - * Stock management - * Foundations members management - * Bank accounts management * Point of Sale * Payments management * Commercial actions management * Contracts management * Standing orders management * Shipping management + * Foundations members management * Donations management * Bookmarks management * Mass Emailings @@ -43,7 +39,4 @@ Description: Easy to use ERP & CRM software to manage your activity. * Data export and import tools * LDAP connectivity * PDF exports - * And a lot of more modules... - . - You can also add third parties external modules or develop yours. - \ No newline at end of file + * And a lot of other modules diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install index 1166abe41ae..198565d3211 100755 --- a/build/deb/install.forced.php.install +++ b/build/deb/install.forced.php.install @@ -4,13 +4,12 @@ // This file must be present into htdocs/install directory // during install process to be used. // -// $Id: install.forced.php.install,v 1.7 2011/07/09 15:48:19 eldy Exp $ +// $Id: install.forced.php.install,v 1.6 2011/07/09 14:11:40 eldy Exp $ // - $force_install_noedit=1; $force_install_message='KeepDefaultValuesDeb'; -$force_install_main_data_root='/usr/share/dolibarr/documents'; -#$force_install_main_data_root='/var/lib/dolibarr'; +#$force_install_main_data_root='/usr/share/dolibarr/documents'; +$force_install_main_data_root='/var/lib/dolibarr'; $force_install_type='mysqli'; $force_install_dbserver='localhost'; $force_install_port='3306'; diff --git a/build/deb/postinst b/build/deb/postinst index be9fb7521b7..4d065f58ca0 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -49,21 +49,19 @@ case "$1" in cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config fi - # Create document directory - #docdir='/var/lib/dolibarr/documents' - docdir='/usr/share/dolibarr/documents' - mkdir -p $docdir - chown -R www-data:www-data $docdir - chmod -R 775 $docdir - chmod -R g+s $docdir + # Create /var/lib/dolibarr/documents + mkdir -p /var/lib/dolibarr/documents + chown -R www-data:www-data /var/lib/dolibarr/documents; + chmod -R 775 /var/lib/dolibarr/documents; + chmod -R g+s /var/lib/dolibarr/documents; # Create an empty conf.php with permission to web server if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ] then echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php touch /usr/share/dolibarr/htdocs/conf/conf.php - chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php - chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php + chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php; + chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php; fi #db_reset "dolibarr/webserver" @@ -108,6 +106,12 @@ case "$1" in done + # Copy icon file + #echo "Copy icon file" + #fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm" + #target="/usr/share/pixmaps/" + #cp -f $fileorig $target + #echo "Install menu entry" # This one is for Gnome ubuntu #fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop" diff --git a/build/deb/templates b/build/deb/templates index 1d1c133f99a..3b370ee68f2 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -15,7 +15,7 @@ Description: Package configuration note Template: dolibarr/webserver Type: select Choices: Apache, Apache-ssl, Both, None -Description: Which Web Server are you running ? +Description: Which Web Server are you running? Dolibarr supports any web server with PHP capabilities, but this configuration process only supports Apache and Apache-SSL. @@ -91,15 +91,6 @@ Template: dolibarr/postrm Type: boolean Default: true Description: Delete database ? - Delete the Dolibarr MySQL database and all its datas (datas related - to this quetion are the Dolibarr DBMS account and all + Answer yes if you want to delete also the Dolibarr MySQL database and all + its datas (datas subjected to this quetion are the Dolibarr DBMS account and all Dolibarr tables) ? - -Template: dolibarr/postrmfile -Type: boolean -Default: true -Description: Delete attached files ? - Delete also all uploaded and generated files (datas related - to this quetion are all files found into /usr/share/dolibarr/documents, - uploaded or generated when using Dolibarr) ? - \ No newline at end of file