packages: wordpress-mu/configpath.patch, wordpress-mu/wordpress-mu.spec - u...

glen glen at pld-linux.org
Mon Dec 7 21:57:27 CET 2009 

Author: glen                         Date: Mon Dec  7 20:57:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update blogs.dir usage

---- Files affected:
packages/wordpress-mu:
   configpath.patch (1.1 -> 1.2) , wordpress-mu.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/wordpress-mu/configpath.patch
diff -u packages/wordpress-mu/configpath.patch:1.1 packages/wordpress-mu/configpath.patch:1.2
--- packages/wordpress-mu/configpath.patch:1.1	Mon Dec  7 21:22:20 2009
+++ packages/wordpress-mu/configpath.patch	Mon Dec  7 21:57:22 2009
@@ -121,3 +121,55 @@
  
  /** Sets up WordPress vars and included files. */
  require_once(ABSPATH . 'wp-settings.php');
+--- wordpress-mu/wp-settings.php~	2009-12-07 22:02:50.000000000 +0200
++++ wordpress-mu/wp-settings.php	2009-12-07 22:25:35.955516316 +0200
+@@ -322,13 +322,13 @@
+ }
+ 
+ if( !defined( "UPLOADBLOGSDIR" ) )
+-	define( "UPLOADBLOGSDIR", 'wp-content/blogs.dir' );
++	define( "UPLOADBLOGSDIR", '/var/lib/wpmu' );
+ 
+ if( !defined( "UPLOADS" ) )
+ 	define( "UPLOADS", UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+ 
+ if( !defined( "BLOGUPLOADDIR" ) )
+-	define( "BLOGUPLOADDIR", WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
++	define( "BLOGUPLOADDIR", "/var/lib/wpmu/{$wpdb->blogid}/files/" );
+ 
+ require (ABSPATH . WPINC . '/plugin.php');
+ require (ABSPATH . WPINC . '/default-filters.php');
+--- wordpress-mu/wp-admin/includes/mu.php~	2009-12-07 22:28:25.000000000 +0200
++++ wordpress-mu/wp-admin/includes/mu.php	2009-12-07 22:28:26.985115629 +0200
+@@ -52,7 +52,7 @@
+ 			$wpdb->query( "DROP TABLE IF EXISTS ". current( $drop_table ) ."" );
+ 		}
+ 		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->blogs WHERE blog_id = %d", $blog_id) );
+-		$dir = apply_filters( 'wpmu_delete_blog_upload_dir', constant( "WP_CONTENT_DIR" ) . "/blogs.dir/{$blog_id}/files/", $blog_id );
++		$dir = apply_filters( 'wpmu_delete_blog_upload_dir', "/var/lib/wpmu/{$blog_id}/files/", $blog_id );
+ 		$dir = rtrim($dir, DIRECTORY_SEPARATOR);
+ 		$top_dir = $dir;
+ 		$stack = array($dir);
+--- wordpress-mu/./wp-includes/wpmu-functions.php~	2009-12-07 22:02:50.000000000 +0200
++++ wordpress-mu/./wp-includes/wpmu-functions.php	2009-12-07 22:29:17.955090675 +0200
+@@ -1410,7 +1410,7 @@
+ 	update_option('siteurl', $url);
+ 	update_option('home', $url);
+ 	update_option('fileupload_url', $url . "files" );
+-	update_option('upload_path', "wp-content/blogs.dir/" . $blog_id . "/files");
++	update_option('upload_path', "/var/lib/wpmu/" . $blog_id . "/files");
+ 	update_option('blogname', stripslashes( $blog_title ) );
+ 	update_option('admin_email', '');
+ 	$wpdb->update( $wpdb->options, array('option_value' => ''), array('option_name' => 'admin_email') );
+--- wordpress-mu/./index-install.php~	2009-12-07 22:02:50.000000000 +0200
++++ wordpress-mu/./index-install.php	2009-12-07 22:29:54.208431939 +0200
+@@ -351,9 +351,6 @@
+ 		return false;
+ 	}
+ 
+-	// Create Blogs living area.
+-	@mkdir( dirname(__FILE__) . "/wp-content/blogs.dir", 0777 );
+-
+ 	$url = stripslashes( "http://".$_SERVER["SERVER_NAME"] . dirname( $_SERVER[ "SCRIPT_NAME" ] ) );
+ 	if( substr( $url, -1 ) == '/' )
+ 		$url = substr( $url, 0, -1 );

================================================================
Index: packages/wordpress-mu/wordpress-mu.spec
diff -u packages/wordpress-mu/wordpress-mu.spec:1.8 packages/wordpress-mu/wordpress-mu.spec:1.9
--- packages/wordpress-mu/wordpress-mu.spec:1.8	Mon Dec  7 21:22:20 2009
+++ packages/wordpress-mu/wordpress-mu.spec	Mon Dec  7 21:57:22 2009
@@ -5,7 +5,7 @@
 Summary(en.UTF-8):	WordPress µ
 Name:		wordpress-mu
 Version:	2.8.6
-Release:	0.34
+Release:	0.36
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://mu.wordpress.org/%{name}-%{version}.tar.gz
@@ -92,7 +92,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir},%{_sbindir},%{_sysconfdir},%{_appdir}/wp-content/{languages,blogs.dir}}
+install -d $RPM_BUILD_ROOT{%{_appdir},%{_sbindir},%{_sysconfdir},%{_appdir}/wp-content/languages,/var/lib/wpmu}
 
 cp -a . $RPM_BUILD_ROOT%{_appdir}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/wp-config.php
@@ -111,22 +111,18 @@
 
 	- Install %{name}-setup
 	- Create empty MySQL database (mysqladmin create wpmu)
-	- Open web browser at: http://$(hostname)/wordpress/wp-admin/install.php
+	- Open web browser at: http://$(hostname)/wpmu/index.php
 EOF
 fi
 
 %post setup
 chmod 660 %{_sysconfdir}/wp-config.php
 chown root:http %{_sysconfdir}/wp-config.php
-chmod 775 %{_appdir} %{_appdir}/wp-content
-chown root:http %{_appdir} %{_appdir}/wp-content
 
 %postun setup
 if [ "$1" = "0" ]; then
 	chmod 640 %{_sysconfdir}/wp-config.php
 	chown root:http %{_sysconfdir}/wp-config.php
-	chmod 755 %{_appdir} %{_appdir}/wp-content
-	chown root:root %{_appdir} %{_appdir}/wp-content
 fi
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
@@ -171,7 +167,7 @@
 %{_appdir}/wp-content/themes/default
 %{_appdir}/wp-content/themes/home
 
-%attr(775,root,http) %{_appdir}/wp-content/blogs.dir
+%attr(775,root,http) /var/lib/wpmu
 
 # -setup package
 %exclude %{_appdir}/index-install.php
@@ -194,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/12/07 20:57:22  glen
+- update blogs.dir usage
+
 Revision 1.8  2009/12/07 20:22:20  glen
 - use config in /etc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress-mu/configpath.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress-mu/wordpress-mu.spec?r1=1.8&r2=1.9&f=u

More information about the pld-cvs-commit mailing list