Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16952
Modified Files:
NEWS upgrade.sh
Log Message:
Removed some personal details.
Added checks to ensure backup directory is created correctly.
Modified echo statement so IP address is written to .htaccess file
correctly.
Added a comment to indicate where a user's cutsom backup commands should
go.
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- NEWS 28 May 2004 09:31:18 -0000 1.137
+++ NEWS 1 Jun 2004 15:42:42 -0000 1.138
@@ -3,6 +3,8 @@
Version 0.7 ()
------------------------------------------------------------------------
+ * Updated upgrade.sh script for better checks (Jez Hancock)
+
* Fixed javascript error when submitting comments with "remember me"
checkbox. (garvinhicking)
Index: upgrade.sh
===================================================================
RCS file: /cvsroot/php-blog/serendipity/upgrade.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- upgrade.sh 7 Apr 2004 06:42:51 -0000 1.1
+++ upgrade.sh 1 Jun 2004 15:42:42 -0000 1.2
@@ -13,17 +13,14 @@
# in a browser. This IP address will be used in a .htaccess file to restrict
# access during the upgrade process:
ip=192.168.0.1
-ip=213.152.51.196
# Change this to the directory containing the current serendipity web files:
blog_dir=/usr/local/www/htdocs/serendipity
-blog_dir=/web/jez.hancock-family.com
# Change this to the directory containing the new serendipity web files:
# This should be the directory containing the cvs version of s9y or the s9y
# tarball contents:
import_dir=/home/username/serendipity
-import_dir=/home/munk/cvs/php-blog/serendipity
# Change this to the directory you wish your weblog files and database to be
# backed up to. A subdirectory 's9y.YYYYMMDD' will be created under here into
@@ -37,7 +34,6 @@
# Note if the backup directory already contains a backup from the current day,
# the script will exit without doing anything.
backup_dir=/home/username/backup
-backup_dir=/opt/backup
# Change this to match your database user/name. Note you will be prompted for
# your password on the commandline.
@@ -73,7 +69,8 @@
echo "Creating backup directory:"
nl
echo "$backup_dir"
-mkdir $backup_dir && ok
+mkdir $backup_dir && ok || \
+ echo "Could not create $backup_dir - exiting."
# backup current weblog to a tarball in the backup dir:
echo "Backing up weblog files from:"
@@ -128,8 +125,8 @@
echo "Adding .htaccess directives to restrict browser access to blog to $ip"
echo "during upgrade process"
exec >> $blog_dir/.htaccess
-echo 'deny from all'
-echo 'allow from $ip'
+echo "deny from all"
+echo "allow from $ip"
echo 'ErrorDocument 403 "Upgrading, please check back soon!!!'
exec > /dev/tty
ok
@@ -180,5 +177,10 @@
echo "After confirming the upgrade was successful, you can safely remove"
echo "this directory."
+# This is the place to do any custom backup stuff - for example I have various
+# directory structures that I copy from my blog base directory, a few custom
+# plugins I copy, etc etc.
+# ...
+
# Uncomment/modify the following line if you run the server:
#chown -R www:www $blog_dir && chmod 600 $blog_dir/serendipity_config_local.inc.php
|
