[Pkg-drupal-commits] r2163 - in /branches/drupal6/debian: README.Debian changelog drupal6.postinst drupal6.postrm
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Fri Feb 18 19:19:11 UTC 2011
Author: luigi
Date: Fri Feb 18 19:19:09 2011
New Revision: 2163
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2163
Log:
Removed automatic link in apache2 configuration directory, added instructions on how to enable to README.Debian (Closes: #565738)
Modified:
branches/drupal6/debian/README.Debian
branches/drupal6/debian/changelog
branches/drupal6/debian/drupal6.postinst
branches/drupal6/debian/drupal6.postrm
Modified: branches/drupal6/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/README.Debian?rev=2163&op=diff
==============================================================================
--- branches/drupal6/debian/README.Debian (original)
+++ branches/drupal6/debian/README.Debian Fri Feb 18 19:19:09 2011
@@ -3,14 +3,15 @@
1. Introduction
2. Manual initial database generation and configuration
-3. Database population script
-4. Deleting the Drupal database
-5. Changes to Apache 2 configuration
-6. Securing your portal
-7. Upgrading database from previous versions
-8. Virtual hosts
-9. Additional themes and modules
-10. Privacy of session cookies
+3. Enabling access in Apache
+4. Database population script
+5. Deleting the Drupal database
+6. Changes to Apache 2 configuration
+7. Securing your portal
+8. Upgrading database from previous versions
+9. Virtual hosts
+10. Additional themes and modules
+11. Privacy of session cookies
A. Customizing themes
B. Links for more support
@@ -38,7 +39,17 @@
in INSTALL.mysql.txt and INSTALL.pgsql.txt files in /usr/share/doc/drupal6.
-3. Database population script
+3. Enabling access in Apache
+----------------------------
+
+Since version 6.20-1, drupal is not enabled by default in Apache 2. To enable
+web access to the drupal application, simply link the /etc/drupal/6/apache2.conf
+in /etc/apache2/conf.d/drupal6.conf with this command:
+
+ ln -s /etc/drupal/6/apache2.conf /etc/apache2/conf.d/drupal6.conf
+
+
+4. Database population script
-----------------------------
Once a database is set up and configured, drupal needs to create tables and
insert default records into it.
@@ -48,7 +59,7 @@
http://localhost/drupal6/install.php
-4. Deleting the Drupal database
+5. Deleting the Drupal database
-------------------------------
The database may be deleted automatically on purging the package
(debconf prompt the user asking to do it or not).
@@ -61,7 +72,7 @@
being the user who admin MySQL.
-5. Changes to Apache 2 configuration
+6. Changes to Apache 2 configuration
------------------------------------
By default, Drupal passes path arguments to itself via its dynamically
@@ -75,7 +86,7 @@
configuration file to match your site configuration.
-6. Securing your portal
+7. Securing your portal
-----------------------
It is very good security measure to restrict access to admin.php only
to trusted IP's and localhost (you can see an example at
@@ -84,7 +95,7 @@
admin page only to ssl streams.
-7. Upgrading database from previous versions
+8. Upgrading database from previous versions
--------------------------------------------
From version 4.7.4 drupal packages will be separated for each major version.
Automatic upgrading the database will not be attempted anymore.
@@ -100,7 +111,7 @@
WARNING: be sure to _NOT_ remove the old package's database.
-8. Virtual hosts
+9. Virtual hosts
----------------
Drupal supports a setup with multiple virtual hosts. Each virtual host
has its own configuration directory in /etc/drupal/6/sites/_virtualhost_.
@@ -115,7 +126,7 @@
file.
-9. Additional modules and themes
+10. Additional modules and themes
--------------------------------
Drupal looks for modules and themes in the modules/ and themes/
@@ -129,7 +140,7 @@
# ln -s /usr/local/share/drupal/themes /usr/share/drupal6/themes/local
-10. Privacy of session cookies
+11. Privacy of session cookies
------------------------------
Drupal does not set the secure flag for the session cookie in an https
Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=2163&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Fri Feb 18 19:19:09 2011
@@ -4,6 +4,10 @@
* debian/watch
- Updated watch file to changed upstream repo
+
+ * debian/{drupal6.post{inst,rm},README.Debian}
+ - Removed automatic link in apache2 configuration directory, added
+ instructions on how to enable to README.Debian (Closes: #565738)
-- Luigi Gangitano <luigi at debian.org> Fri, 18 Feb 2011 20:00:12 +0100
Modified: branches/drupal6/debian/drupal6.postinst
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/drupal6.postinst?rev=2163&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.postinst (original)
+++ branches/drupal6/debian/drupal6.postinst Fri Feb 18 19:19:09 2011
@@ -34,22 +34,6 @@
case "$1" in
configure)
-
- webserver=`echo $webserver|sed -e 's/, */ /g'`
-
- webserver="apache2"
-
- if [ ! -d /etc/$webserver/conf.d/ ]; then
- install -d -m755 /etc/$webserver/conf.d/
- fi
- if [ ! -e /etc/$webserver/conf.d/drupal6.conf ]; then
- ln -s ${includefile} /etc/$webserver/conf.d/drupal6.conf
- restart="$i $restart"
- fi
-
- servers="apache2"
- . /usr/share/wwwconfig-common/restart.sh
-
# Permissions
dpkg-statoverride --list $filesdir || dpkg-statoverride --add --force --update www-data www-data 0750 $filesdir
Modified: branches/drupal6/debian/drupal6.postrm
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/drupal6.postrm?rev=2163&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.postrm (original)
+++ branches/drupal6/debian/drupal6.postrm Fri Feb 18 19:19:09 2011
@@ -62,7 +62,7 @@
# Remove configuration files (conf.php, $SITE.php)
- rm -f /etc/drupal/sites/default/settings.php
+ rm -f /etc/drupal/sites/default/settings.php
if [ "$1" = "purge" ]; then
rm -f ${dbconfigfile}
More information about the Pkg-drupal-commits
mailing list