Skip to content

Commit

Permalink
Tighten up README, tweak HISTORY, duplicate config-dis.php to multi-site
Browse files Browse the repository at this point in the history
  • Loading branch information
Pete Cooper committed Mar 1, 2015
1 parent bc2b874 commit ac9a510
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 45 deletions.
2 changes: 1 addition & 1 deletion HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Changes in 4.5.7
* Maintenance release with bug fixes.
* Textile v2.4.3 resolves PHP 5.5 compatibility issues.
* Updated default site theme and libraries.
* Setup now remembers settings. No more 'form resubmission' browser warnings when going back through wizard.
* Setup now remembers settings. No more 'form resubmission' browser warnings when going back through the wizard.
* Allow pre_publish_script in multi-site installations.
* Email address validation uses PHP's filter_var(), which permits addresses such as @[127.0.0.1].
* Fixed: <txp:link_to_prev>, <txp:link_to_next>, <txp:prev_title>, and <txp:next_title> tags for certain combinations with <txp:article_custom>.
Expand Down
51 changes: 24 additions & 27 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ system. Textpattern is both free and open source.
* Extract the Textpattern files to your site (in the web root, or a
subdirectory). The top-level index.php file should reside in this directory,
as should the /textpattern/ and /rpc/ directories.
* Ensure the root .htaccess file is transferred across correctly to your site.
The file is hidden by default on some operating systems, including OS X. Most
FTP clients and IDEs have an option to show these hidden files. Otherwise, you
can temporarily show hidden files in OS X by using the Terminal.app - follow
these instructions:
* Ensure the top-level .htaccess file is transferred to your site. The file is
hidden by default on some operating systems, including OS X. Most FTP clients
and IDEs have an option to show these hidden files. Otherwise, you can
temporarily show hidden files in OS X by using the Terminal.app - follow these
instructions:
http://textpattern.com/hidden-files-osx
* Create or establish the existence of a working MySQL database along with valid
username and password credentials, then load /textpattern/setup/
* Create or verify the existence of a working MySQL database with valid username
and password, then load /textpattern/setup/
(or /subdirectory/textpattern/setup/) in your browser to start the
installation process and follow the directions.
* When the installation is complete, remove the /textpattern/setup/ directory
Expand All @@ -37,31 +37,28 @@ system. Textpattern is both free and open source.

== Upgrading ==

* Log out of the admin-side.
* Verify the existence of a working Textpattern database and file backup.
* Replace the three files in your Textpattern installation directory (index.php,
css.php and .htaccess), everything in your /js/ directory, everything in
your /rpc/ directory and everything in your /textpattern/ directory
(except /textpattern/config.php) with the corresponding files in this
distribution. Note that css.php and /rpc/ may not exist in your current site
if you are upgrading from Textpattern prior to version 4.2.0.
* It is recommended that you flush the cache of your browser, to ensure
old cached files are not being used in preference to any newer versions within
the upgrade.
* When you log in to the admin-side, the upgrade script(s) will run
automatically. Please check the diagnostics (Admin -> Diagnostics) to confirm
the correct Textpattern version number is displayed and whether there are any
* Log out of the Textpattern admin-side.
* Verify the existence of a known-good Textpattern database and file backup.
* Replace the top-level index.php, css.php and .htaccess files, everything in
the /js/ directory, everything in the /rpc/ directory and everything in the
/textpattern/ directory (except /textpattern/config.php) with the
corresponding files in this distribution. Note: css.php and /rpc/ may not
exist if the installed version of Textpattern is prior to 4.2.0.
* It is recommended that the browser cache is cleared to ensure the newer files
are used in preference to the older files.
* Log in to the Textpattern admin-side. The upgrade script(s) will run
automatically. Check the diagnostics (Admin -> Diagnostics) to confirm the
correct Textpattern version number is displayed and whether there are any
errors.
NOTE: Upgrades from versions prior to 4.2.0 will present this warning
upon your very first login to the admin-side:
upon the first login to the admin-side:
Warning: Unknown column 'user_name' in 'where clause' select name,
val from txp_prefs where prefs_id=1 AND user_name='' in
/path/to/your/site/textpattern/lib/txplib_db.php on line xx
This is expected behaviour for the very first login after an upgrade.
The warning will disappear with subsequent navigation in the admin-side.
* Verify all preference settings.
* When the upgrade is complete, remove the /textpattern/setup/ directory from
your site.
This is expected behaviour. The warning will disappear with subsequent
navigation in the admin-side.
* Verify all preference settings (Admin -> Preferences).
* Remove the /textpattern/setup/ directory from your site.


== Getting Started ==
Expand Down
95 changes: 78 additions & 17 deletions sites/site1/private/config-dist.php
Original file line number Diff line number Diff line change
@@ -1,48 +1,109 @@
<?php

/*
* Textpattern Content Management System
* http://textpattern.com
*
* Copyright (C) 2015 The Textpattern Development Team
*
* This file is part of Textpattern.
*
* Textpattern is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, version 2.
*
* Textpattern is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
*/

/**
* Database credentials and site configuration.
*
* @package DB
*/

/**
* mysql database
* MySQL database.
*
* @global string $txpcfg['db']
*/
$txpcfg['db'] = 'databasename';

$txpcfg['db'] = 'databasename';

/**
* database login name
* Database login name.
*
* @global string $txpcfg['user']
*/
$txpcfg['user'] = 'root';

$txpcfg['user'] = 'root';

/**
* database password
* Database password.
*
* @global string $txpcfg['pass']
*/
$txpcfg['pass'] = '';

$txpcfg['pass'] = '';

/**
* database host
* Database hostname.
*
* @global string $txpcfg['host']
*/

$txpcfg['host'] = 'localhost';
$txpcfg['host'] = 'localhost';

/**
* table prefix (Use ONLY if you require multiple installs in one db)
* Table prefix.
*
* Use only if you require multiple installs in one database.
*
* @global string $txpcfg['table_prefix']
*/

$txpcfg['table_prefix'] = '';
$txpcfg['table_prefix'] = '';

/**
* full server path to textpattern dir (no slash at end)
* Full server path to textpattern directory, no slash at the end.
*
* @global string $txpcfg['txpath']
*/

$txpcfg['txpath'] = '/home/path/to/textpattern';
$txpcfg['txpath'] = '/home/path/to/textpattern';

/**
* DB Connection Charset, only for MySQL4.1 and up. Must be equal to the Table-Charset.
* Database connection charset.
*
* Only for MySQL 4.1 and up. Must be equal to the table-charset, e.g. latin1
* or utf8.
*
* @global string $txpcfg['dbcharset']
*/

$txpcfg['dbcharset'] = 'latin1';
$txpcfg['dbcharset'] = 'utf8';

/**
* optional: database client flags as needed (@see http://www.php.net/manual/function.mysql-connect.php)
* Database client flags.
*
* These are optional. Use the database client flags as needed.
* Available flags include: MYSQL_CLIENT_SSL, MYSQL_CLIENT_COMPRESS,
* MYSQL_CLIENT_IGNORE_SPACE, MYSQL_CLIENT_INTERACTIVE
*
* @global int $txpcfg['client_flags']
* @link http://www.php.net/manual/function.mysql-connect.php
*/

# $txpcfg['client_flags'] = MYSQL_CLIENT_SSL | MYSQL_CLIENT_COMPRESS;
$txpcfg['client_flags'] = 0;

/*
* Optional, advanced: http address of the site serving images
* see http://forum.textpattern.com/viewtopic.php?id=34493
*/

define('txpath', $txpcfg['txpath']);
// define('ihu', 'http://static.example.com/');

0 comments on commit ac9a510

Please sign in to comment.