packages: wordpress-mu/wordpress-mu.spec, wordpress-mu/configpath.patch (NE...
glen
glen at pld-linux.org
Mon Dec 7 21:22:25 CET 2009
Author: glen Date: Mon Dec 7 20:22:25 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- use config in /etc
---- Files affected:
packages/wordpress-mu:
wordpress-mu.spec (1.7 -> 1.8) , configpath.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/wordpress-mu/wordpress-mu.spec
diff -u packages/wordpress-mu/wordpress-mu.spec:1.7 packages/wordpress-mu/wordpress-mu.spec:1.8
--- packages/wordpress-mu/wordpress-mu.spec:1.7 Thu Nov 26 20:19:34 2009
+++ packages/wordpress-mu/wordpress-mu.spec Mon Dec 7 21:22:20 2009
@@ -5,7 +5,7 @@
Summary(en.UTF-8): WordPress µ
Name: wordpress-mu
Version: 2.8.6
-Release: 0.29
+Release: 0.34
License: GPL
Group: Applications/Publishing
Source0: http://mu.wordpress.org/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
Source1: apache.conf
Patch0: pld.patch
Patch1: wp_queries.patch
+Patch2: configpath.patch
Source2: lighttpd.conf
BuildRequires: /usr/bin/php
Requires: php-gettext
@@ -83,6 +84,7 @@
sed -ne '/global $wp_queries;/,/WP_FIRST_INSTALL$/p' wp-admin/includes/schema.php > wp-admin/includes/schema-wp_queries.php
sed -i -e '/global $wp_queries;/,/WP_FIRST_INSTALL$/d' wp-admin/includes/schema.php
%patch1 -p1
+%patch2 -p1
%build
php -l wp-admin/includes/schema.php
@@ -93,7 +95,7 @@
install -d $RPM_BUILD_ROOT{%{_appdir},%{_sbindir},%{_sysconfdir},%{_appdir}/wp-content/{languages,blogs.dir}}
cp -a . $RPM_BUILD_ROOT%{_appdir}
-cp -a $RPM_BUILD_ROOT{%{_appdir}/wp-config-sample.php,%{_sysconfdir}/wp-config.php}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/wp-config.php
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
@@ -192,6 +194,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2009/12/07 20:22:20 glen
+- use config in /etc
+
Revision 1.7 2009/11/26 19:19:34 glen
- hack to make possible to switch blog_ids (import script for example)
================================================================
Index: packages/wordpress-mu/configpath.patch
diff -u /dev/null packages/wordpress-mu/configpath.patch:1.1
--- /dev/null Mon Dec 7 21:22:25 2009
+++ packages/wordpress-mu/configpath.patch Mon Dec 7 21:22:20 2009
@@ -0,0 +1,123 @@
+--- wordpress-mu-2.8.6/wp-admin/setup-config.php~ 2009-11-26 21:15:41.000000000 +0200
++++ wordpress-mu-2.8.6/wp-admin/setup-config.php 2009-12-07 21:48:53.335423259 +0200
+@@ -24,6 +24,7 @@
+ define('ABSPATH', dirname(dirname(__FILE__)).'/');
+ define('WPINC', 'wp-includes');
+ define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
++define('WP_CONFIG_DIR', '/etc/webapps/wordpress-mu/');
+ /**#@-*/
+
+ require_once(ABSPATH . WPINC . '/compat.php');
+@@ -35,11 +36,8 @@
+
+ $configFile = file(ABSPATH . 'wp-config-sample.php');
+
+-if ( !is_writable(ABSPATH))
+- wp_die("Sorry, I can't write to the directory. You'll have to either change the permissions on your WordPress directory or create your wp-config.php manually.");
+-
+ // Check if wp-config.php has been created
+-if (file_exists(ABSPATH . 'wp-config.php'))
++if (file_exists(WP_CONFIG_DIR. 'wp-config.php') && filesize(WP_CONFIG_DIR. 'wp-config.php'))
+ wp_die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
+
+ // Check if wp-config.php exists above the root directory but is not part of another install
+@@ -155,7 +153,7 @@
+ if ( !empty($wpdb->error) )
+ wp_die($wpdb->error->get_error_message());
+
+- $handle = fopen(ABSPATH . 'wp-config.php', 'w');
++ $handle = fopen(WP_CONFIG_DIR. 'wp-config.php', 'w');
+
+ foreach ($configFile as $line_num => $line) {
+ switch (substr($line,0,16)) {
+@@ -179,7 +177,6 @@
+ }
+ }
+ fclose($handle);
+- chmod(ABSPATH . 'wp-config.php', 0666);
+
+ display_header();
+ ?>
+--- wordpress-mu-2.8.6/index-install.php~ 2009-11-26 21:15:41.000000000 +0200
++++ wordpress-mu-2.8.6/index-install.php 2009-12-07 21:57:20.321942364 +0200
+@@ -465,7 +465,7 @@
+ require_once('wp-includes/wp-db.php');
+ printheader();
+
+- $handle = fopen('wp-config.php', 'w');
++ $handle = fopen('/etc/webapps/wordpress-mu/wp-config.php', 'w');
+
+ foreach ($wp_config_file as $line) {
+ switch ( trim( substr($line,0,16) ) ) {
+@@ -510,7 +510,6 @@
+ }
+ }
+ fclose($handle);
+- chmod('wp-config.php', 0644);
+ define( 'VHOST', $vhost );
+ }
+
+@@ -704,7 +703,7 @@
+ step2();
+
+ // Install Blog!
+- include_once('./wp-config.php');
++ include_once('/etc/webapps/wordpress-mu/wp-config.php');
+ include_once('./wp-admin/includes/upgrade.php');
+
+ $_SERVER[ 'HTTP_HOST' ] = str_replace( 'www.', '', $_SERVER[ 'HTTP_HOST' ] ); // normalise hostname - no www.
+--- wordpress-mu-2.8.6/wp-admin/includes/mu.php~ 2009-11-26 21:15:41.000000000 +0200
++++ wordpress-mu-2.8.6/wp-admin/includes/mu.php 2009-12-07 21:50:50.055311408 +0200
+@@ -687,7 +687,7 @@
+ $out .= "define( '$key', '" . wp_generate_password() . wp_generate_password() . "' );<br />";
+ }
+ if( $out != '' ) {
+- $msg = sprintf( __( 'Warning! WordPress encrypts user cookies, but you must add the following lines to <strong>%swp-config.php</strong> for it to be more secure.<br />Please add the code before the line, <code>/* That\'s all, stop editing! Happy blogging. */</code>' ), ABSPATH );
++ $msg = sprintf( __( 'Warning! WordPress encrypts user cookies, but you must add the following lines to <strong>%swp-config.php</strong> for it to be more secure.<br />Please add the code before the line, <code>/* That\'s all, stop editing! Happy blogging. */</code>' ), WP_CONFIG_DIR);
+ $msg .= "<blockquote>$out</blockquote>";
+
+ echo "<div id='update-nag'>$msg</div>";
+--- wordpress-mu-2.8.6/wp-blog-header.php~ 2009-12-07 21:52:41.000000000 +0200
++++ wordpress-mu-2.8.6/wp-blog-header.php 2009-12-07 21:52:43.755301786 +0200
+@@ -7,7 +7,8 @@
+
+ if ( !isset($wp_did_header) ) {
+ // WPMU Runs installer if things aren't set up correctly
+- if ( !file_exists( dirname(__FILE__) . '/wp-config.php') && !file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
++ if (!filesize('/etc/webapps/wordpress-mu/wp-config.php') &&
++ !file_exists( dirname(__FILE__) . '/wp-config.php') && !file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
+ if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
+ else $path = 'wp-admin/';
+ // install WPMU!
+--- wordpress-mu-2.8.6/wp-load.php~ 2009-11-26 21:15:41.000000000 +0200
++++ wordpress-mu-2.8.6/wp-load.php 2009-12-07 21:55:27.875280644 +0200
+@@ -18,13 +18,17 @@
+
+ /** Define ABSPATH as this files directory */
+ define( 'ABSPATH', dirname(__FILE__) . '/' );
++define( 'WP_CONFIG_DIR', '/etc/webapps/wordpress-mu/' );
+
+ if ( defined('E_RECOVERABLE_ERROR') )
+ error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+ else
+ error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+
+-if ( file_exists( ABSPATH . 'wp-config.php') ) {
++if ( file_exists( WP_CONFIG_DIR . 'wp-config.php') ) {
++ require_once( WP_CONFIG_DIR . 'wp-config.php' );
++
++} elseif ( file_exists( ABSPATH . 'wp-config.php') ) {
+
+ /** The config file resides in ABSPATH */
+ require_once( ABSPATH . 'wp-config.php' );
+--- wordpress-mu/wp-config-sample.php~ 2009-12-07 22:01:40.038791828 +0200
++++ wordpress-mu/wp-config-sample.php 2009-12-07 22:02:21.025313883 +0200
+@@ -107,7 +107,7 @@
+
+ /** WordPress absolute path to the Wordpress directory. */
+ if ( !defined('ABSPATH') )
+- define('ABSPATH', dirname(__FILE__) . '/');
++ define('ABSPATH', '/usr/share/wordpress-mu/');
+
+ /** Sets up WordPress vars and included files. */
+ require_once(ABSPATH . 'wp-settings.php');
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress-mu/wordpress-mu.spec?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list