Qual: A lot of fixes to enhance package quality

This commit is contained in:
Laurent Destailleur 2011-07-09 14:11:40 +00:00
parent 266fa2707e
commit e08e1524e7
7 changed files with 30 additions and 34 deletions

View File

@ -4,7 +4,7 @@
Alias /dolibarr /usr/share/dolibarr/htdocs Alias /dolibarr /usr/share/dolibarr/htdocs
</IfModule> </IfModule>
# You can also use dolibarr as a VirtualHost # You can also use phpLDAPadmin as a VirtualHost
# <VirtualHost *:*> # <VirtualHost *:*>
# ServerName mydolibarrhostname.com # ServerName mydolibarrhostname.com
# ServerAdmin root@example.com # ServerAdmin root@example.com
@ -13,10 +13,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
# CustomLog logs/ldap.example.com-access.log common # CustomLog logs/ldap.example.com-access.log common
# </VirtualHost> # </VirtualHost>
# Directory for web pages <Directory /usr/share/dolibarr/htdocs>
<DirectoryMatch /usr/share/dolibarr>
Order deny,allow
Allow from all
DirectoryIndex index.php DirectoryIndex index.php
Options +FollowSymLinks +Indexes Options +FollowSymLinks +Indexes
@ -56,23 +53,16 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
#ExpiresByType application/x-javascript A2592000 #ExpiresByType application/x-javascript A2592000
#ExpiresByType application/javascript A2592000 #ExpiresByType application/javascript A2592000
</DirectoryMatch> </Directory>
# Directory for public pages <Directory /usr/share/dolibarr/htdocs/public/>
<DirectoryMatch /usr/share/dolibarr/htdocs/public>
AllowOverride All AllowOverride All
Order deny,allow Order deny,allow
Allow from all Allow from all
</DirectoryMatch> </Directory>
# Directory for data files <Directory /var/lib/dolibarr>
<DirectoryMatch /usr/share/dolibarr/documents>
AllowOverride All AllowOverride All
Order deny,allow Order deny,allow
Allow from all Allow from all
</DirectoryMatch> </Directory>
<DirectoryMatch /var/lib/dolibarr>
AllowOverride All
Order deny,allow
Allow from all
</DirectoryMatch>

View File

@ -1,4 +1,4 @@
dolibarr 3.1.0 unstable; urgency=low dolibarr 3.1.0 unstable; urgency=low
* New 3.1.0 release * New 3.1.0 release
More information into /usr/share/dolibarr/ChangeLog file. More information into /usr/share/dolibarr/ChangeLog file.
-- maintainer Laurent Destailleur <eldy@users.sourceforge.net> 2011-07-09 -- maintainer Laurent Destailleur <eldy@users.sourceforge.net> 2011-07-09

View File

@ -9,7 +9,7 @@ Section: web
Priority: optional Priority: optional
Recommends: mozilla | netscape Recommends: mozilla | netscape
Homepage: http://www.dolibarr.org Homepage: http://www.dolibarr.org
Description: An 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 Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship features for Enterprise Resource Planning (ERP) and Customer Relationship

View File

@ -1 +1,4 @@
Copyright 2011 Laurent Destailleur <eldy@users.sourceforge.net>
This software is distributed under GPL v2 licence.
See file /usr/share/common-licenses/GPL-2 See file /usr/share/common-licenses/GPL-2

View File

@ -4,13 +4,12 @@
// This file must be present into htdocs/install directory // This file must be present into htdocs/install directory
// during install process to be used. // 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_noedit=1;
$force_install_message='KeepDefaultValuesDeb'; $force_install_message='KeepDefaultValuesDeb';
$force_install_main_data_root='/usr/share/dolibarr/documents'; #$force_install_main_data_root='/usr/share/dolibarr/documents';
#$force_install_main_data_root='/var/lib/dolibarr'; $force_install_main_data_root='/var/lib/dolibarr';
$force_install_type='mysqli'; $force_install_type='mysqli';
$force_install_dbserver='localhost'; $force_install_dbserver='localhost';
$force_install_port='3306'; $force_install_port='3306';

View File

@ -49,21 +49,19 @@ case "$1" in
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
fi fi
# Create document directory # Create /var/lib/dolibarr/documents
#docdir='/var/lib/dolibarr/documents' mkdir -p /var/lib/dolibarr/documents
docdir='/usr/share/dolibarr/documents' chown -R www-data:www-data /var/lib/dolibarr/documents;
mkdir -p $docdir chmod -R 775 /var/lib/dolibarr/documents;
chown -R www-data:www-data $docdir chmod -R g+s /var/lib/dolibarr/documents;
chmod -R 775 $docdir
chmod -R g+s $docdir
# Create an empty conf.php with permission to web server # Create an empty conf.php with permission to web server
if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ] if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
then then
echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php
touch /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 chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php;
chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php;
fi fi
#db_reset "dolibarr/webserver" #db_reset "dolibarr/webserver"
@ -108,6 +106,12 @@ case "$1" in
done 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" #echo "Install menu entry"
# This one is for Gnome ubuntu # This one is for Gnome ubuntu
#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop" #fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"

View File

@ -91,6 +91,6 @@ Template: dolibarr/postrm
Type: boolean Type: boolean
Default: true Default: true
Description: Delete database ? Description: Delete database ?
Do I have to delete also the Dolibarr MySQL database and all its datas Answer yes if you want to delete also the Dolibarr MySQL database and all
(datas subjected to this quetion are the Dolibarr DBMS account and all its datas (datas subjected to this quetion are the Dolibarr DBMS account and all
Dolibarr tables) ? Dolibarr tables) ?