add readme, small update

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index 580ea3cb90f92302f4ad1ff336fd8e82cf2930e5..08028729fbfde68a76655fe7e3e6a1e43a4f2571 100644 (file)
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -161,7 +161,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
@@ -178,8 +178,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' );
@@ -468,7 +468,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
@@ -726,7 +726,7 @@ fi
 
 Enable account creation that we initially disabled.
 <source lang="bash">
-sed -i "/\\\$wgGroupPermissions\\['\\*'\\]\\['createaccount'\\] = false;/d" $mwc
+sed -i --follow-symlinks "/\\\$wgGroupPermissions\\['\\*'\\]\\['createaccount'\\] = false;/d" $mwc
 </source>
 
 == Additional Configuration with Pywikibot ==
@@ -903,7 +903,7 @@ tee -a $mwc<<'EOF'
 EOF
 mkdir -p ~/wiki_backups
 mysqldump -p$dbpass --default-character-set=binary my_wiki  > ~/wiki_backups/wiki_db_backup
-sed -i '\$ d' $mwc # delete read only setting
+sed -i --follow-symlinks '\$ d' $mwc # delete read only setting
 ENDSSH
 set -x
 rdiff-backup root@$mwdomain::/root/wiki_backups ~/backup/${mwdomain}_wiki_db_backup
@@ -924,7 +924,7 @@ If you are like most people and don't use the old-school mail spool, setup the b
 
 '''Optional & requires additional steps'''
 <source lang="bash" type="example">
-sed -i "/^root:/d" /etc/aliases
+sed -i --follow-symlinks "/^root:/d" /etc/aliases
 echo "root: EXAMPLE_ONLY_REPLACE_ME@gmail.com" >> /etc/aliases
 newaliases
 </source>

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..e89a5c2
--- /dev/null
+++ b/README
@@ -0,0 +1,3 @@
+Mediawiki setup guide / fully automated script
+
+Alternate form of https://ofswiki.org/wiki/Mediawiki_Setup_Guide