From 588d277988efb692ae76ed500ebd3727db386461 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Fri, 26 Aug 2016 00:13:07 -0700
Subject: [PATCH] get latest fix

---
 Mediawiki_Setup_Guide | 14 ++++++++++----
 mw-setup-script       | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index 0802872..f060408 100644
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -893,21 +893,27 @@ sudo dd of=$backup_script <<'EOFOUTER'
 last_error=0
 trap 'last_error=$?' ERR
 source ~/mw_vars
+# No strict because the host is likely not named the same as
+# the domain.
+ssh="ssh -oStrictHostKeyChecking=no"
 logfile=/var/log/${mwdomain}_backup.log
 {
 echo "#### starting backup at $(date) ####"
-ssh root@$mwdomain <<ENDSSH
+$ssh root@$mwdomain <<ENDSSH
 set -x
 tee -a $mwc<<'EOF'
 \$wgReadOnly = 'Dumping Database, Access will be restored shortly';
 EOF
 mkdir -p ~/wiki_backups
 mysqldump -p$dbpass --default-character-set=binary my_wiki  > ~/wiki_backups/wiki_db_backup
-sed -i --follow-symlinks '\$ d' $mwc # delete read only setting
+sed -i '\$ d' $mwc # delete read only setting
 ENDSSH
+# add no strict option to the defaults
+
+rdiff() { rdiff-backup --remote-schema "$ssh -C  %s rdiff-backup --server" "$@"; }
 set -x
-rdiff-backup root@$mwdomain::/root/wiki_backups ~/backup/${mwdomain}_wiki_db_backup
-rdiff-backup root@$mwdomain::$mw ~/backup/${mwdomain}_wiki_file_backup
+rdiff root@$mwdomain::/root/wiki_backups ~/backup/${mwdomain}_wiki_db_backup
+rdiff root@$mwdomain::$mw ~/backup/${mwdomain}_wiki_file_backup
 set +x
 echo "=== ending backup at $(date) ===="
 }  &>>$logfile
diff --git a/mw-setup-script b/mw-setup-script
index 12f0c45..40b5cfa 100755
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -40,7 +40,7 @@ mw-ext () {
         mw-clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/$ext
         if [[ -e $mw/ext/$ext/extension.json ]]; then
             # new style extension. remove old style declaration
-            sed -i '#^require_once( "\\\$IP/extensions/\$ext/\$ext\.php" );#d' $mwc
+            sed -i --follow-symlinks '#^require_once( "\\\$IP/extensions/\$ext/\$ext\.php" );#d' $mwc
             teeu $mwc <<EOF
 wfLoadExtension( '$ext' );
 EOF
@@ -57,8 +57,8 @@ EOF
 mw-skin() {
     local skin=$1
     mw-clone https://gerrit.wikimedia.org/r/p/mediawiki/skins/$skin
-    sed -i '/^wfLoadSkin/d' $mwc
-    sed -i '/^\$wgDefaultSkin/d' $mwc
+    sed -i --follow-symlinks '/^wfLoadSkin/d' $mwc
+    sed -i --follow-symlinks '/^\$wgDefaultSkin/d' $mwc
     teeu $mwc <<EOF
 \$wgDefaultSkin = "${skin,,*}";
 wfLoadSkin( '$skin' );
@@ -248,7 +248,7 @@ EOF
 # Increase from default of 2M to 100M.
 # This will at least allow high res pics etc.
 php_ini=$(php -r 'echo(php_ini_loaded_file());')
-sed -i 's/^\(upload_max_filesize\|post_max_size\)\b.*/\1 = 100M/' $php_ini
+sed -i --follow-symlinks 's/^\(upload_max_filesize\|post_max_size\)\b.*/\1 = 100M/' $php_ini
 if isdeb; then
     service apache2 restart
 else
@@ -408,7 +408,7 @@ EOF
 fi
 # </source>
 # <source lang="bash">
-sed -i "/\\\$wgGroupPermissions\\['\\*'\\]\\['createaccount'\\] = false;/d" $mwc
+sed -i --follow-symlinks "/\\\$wgGroupPermissions\\['\\*'\\]\\['createaccount'\\] = false;/d" $mwc
 # </source>
 # <source lang="bash">
 # get repo
-- 
2.30.2