rpms/drupal/F-10 drupal-files-migrator.sh, NONE, 1.1 drupal-README.fedora, 1.4, 1.5 drupal.spec, 1.20, 1.21

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15403

Modified Files:
	drupal-README.fedora drupal.spec 
Added Files:
	drupal-files-migrator.sh 
Log Message:
selinux and cron fixes.



--- NEW FILE drupal-files-migrator.sh ---
#!/bin/bash
cd /etc/drupal
for i in `ls -1`; do
mv $i/files /var/lib/drupal/files/$i
/sbin/restorecon /var/lib/drupal/files/$i
ln -s /var/lib/drupal/files/$i /etc/drupal/$i/files
done


Index: drupal-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/drupal-README.fedora,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drupal-README.fedora	9 Oct 2008 12:13:54 -0000	1.4
+++ drupal-README.fedora	18 Feb 2009 14:40:24 -0000	1.5
@@ -39,3 +39,22 @@
 
 To help mitigate this, uncomment the following line in /etc/httpd/conf.d/drupal.conf:
 #php_flag session.cookie_secure on
+
+
+4. Upgrading
+
+Prior to upgrading to a new version, log into each site with the first/admin user, 
+upgrade the rpm, and then run the database upgrader by navigating to
+http://site/update.php.
+
+If upgrading to version 6.9-2 or later, please note that
+the locations for the sites' files directories has changed, and that you'll need
+to move them and symlink accordingly.  A script is included in the doc folder:
+/usr/share/drupal-VERSION/drupal-files-migrator.sh.  Please use this script as a
+guideline for the changes you'll need to make. 
+
+Essentially, the site folders will stay in /etc/drupal, but from there the files folders
+will be moved to /var/lib/drupal/files/SITENAME, and symlinked accordingly.  This is done
+for SELinux reasons, see https://bugzilla.redhat.com/show_bug.cgi?id=472642.
+
+Patches to the script are welcome!


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/drupal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- drupal.spec	15 Jan 2009 13:21:24 -0000	1.20
+++ drupal.spec	18 Feb 2009 14:40:24 -0000	1.21
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
 Version:  6.9
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -11,6 +11,7 @@
 Source1: drupal.conf
 Source2: drupal-README.fedora
 Source3: drupal-cron
+Source4: drupal-files-migrator.sh
 Patch0: drupal-6.0-scripts-noshebang.patch
 
 BuildArch: noarch
@@ -47,15 +48,17 @@
 mkdir -p %{buildroot}%{_docdir}
 cp -pr %SOURCE2 .
 install -D -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/drupal 
-mkdir -p %{buildroot}%{_localstatedir}/lib/drupal
-ln -s ../../..%{_localstatedir}/lib/drupal %{buildroot}%{drupaldir}/files
+mkdir -p %{buildroot}%{_localstatedir}/lib/drupal/files/default
+#ln -s ../../..%{_localstatedir}/lib/drupal %{buildroot}%{drupaldir}/files
+ln -s ../../..%{_localstatedir}/lib/drupal/files/default %{buildroot}%{_sysconfdir}/drupal/default/files
+cp -pr %SOURCE4 .
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt
+%doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt drupal-files-migrator.sh
 %{drupaldir}
 %config(noreplace) %{drupaldir}/.htaccess
 %exclude %{drupaldir}/CHANGELOG.txt
@@ -68,12 +71,24 @@
 %exclude %{_sysconfdir}/drupal/all/README.txt
 %config(noreplace) %{_sysconfdir}/drupal/default
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/drupal.conf
-%attr(755,root,apache) %{_sysconfdir}/cron.hourly/drupal
+%attr(755,root,apache) %config(noreplace) %{_sysconfdir}/cron.hourly/drupal
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Tue Feb 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-2
+- Drop pre script for files move, 472642.
+- Updated drupal-README.fedora.
+- Mark cron job noreplace, BZ 485567.
+
 * Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-1
-- Upgrade to 6.9, DRUPAL-SA-CORE-2009-001.
+- Upgrade to 6.9, SA-CORE-2009-001.
+
+* Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.8-1
+- Upgrade to 6.8.
+- Move files directories from sites to /var/lib/drupal/files/N for selinux reasons, 472642.
+- Included script to move files outside of default, use at your own risk, patches welcome.
 
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 6.7-1
 - Upgrade to 6.7, SA-2008-073.