From: Ian Kelling <ian@iankelling.org>
Date: Fri, 5 May 2017 15:51:05 +0000 (-0700)
Subject: update latest
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=fb8c514f359f6fcb443d774c3c305f804a853857;p=mediawiki-setup

update latest
---

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index d50aa7c..81f4d62 100644
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -264,10 +264,10 @@ else
 fi
 
 
-# skip if we already set the root pass
+# skip if we already set the root pass and are on pre-debian 9.
 if ! echo exit|mysql -uroot "-p$dbpass"; then
     # Note: we set a root password here, but in debian 9+, it is ignored;
-    # only the local user root can login, and a password is silently ignored.
+    # only the local user root can login, and any password is accepted.
     # We answer these interactive prompts:
     # Enter current password for root (enter for none):
     # Set root password? [Y/n]
@@ -391,14 +391,12 @@ Here, we use some scripts automate setting up the Let 's Encrypt cert and
 the apache config.
 
 <source lang="bash">
-temp=$(mktemp -d)
-cd $temp
-git_site=https://iankelling.org/git
 l=$mw/../../logs
 mkdir -p $l
-
-git clone $git_site/basic-https-conf
-basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain <<EOF
+temp=$(mktemp -d)
+cd $temp
+git clone https://iankelling.org/git/basic-https-conf
+{ cat <<EOF
 ServerAdmin $mw_email
 RewriteEngine On
 # make the site's root url go to our main page
@@ -410,6 +408,7 @@ find -L $(readlink -f $mw) -name .htaccess \
     | while read line; do
     echo -e "<Directory ${line%/.htaccess}>\n $(< $line)\n</Directory>";
 done
+} | basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain
 cd
 rm -rf $temp
 </source>
@@ -1127,3 +1126,5 @@ This means the code is compatible with gplv3.
 
 * Get Visual editor extension.
 * Don't require registration for edits
+* Take a look at the new debian mediawiki package's apache conf
+* For perf, translate extensions allow/deny directives, and set AllowOverride None in apache.conf
diff --git a/mw-setup-script b/mw-setup-script
index 9c1fd86..d13c696 100755
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -126,10 +126,10 @@ else
 fi
 
 
-# skip if we already set the root pass
+# skip if we already set the root pass and are on pre-debian 9.
 if ! echo exit|mysql -uroot "-p$dbpass"; then
     # Note: we set a root password here, but in debian 9+, it is ignored;
-    # only the local user root can login, and a password is silently ignored.
+    # only the local user root can login, and any password is accepted.
     # We answer these interactive prompts:
     # Enter current password for root (enter for none):
     # Set root password? [Y/n]
@@ -188,14 +188,12 @@ $wgGroupPermissions['*']['createaccount'] = false;
 EOF
 # </source>
 # <source lang="bash">
-temp=$(mktemp -d)
-cd $temp
-git_site=https://iankelling.org/git
 l=$mw/../../logs
 mkdir -p $l
-
-git clone $git_site/basic-https-conf
-basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain <<EOF
+temp=$(mktemp -d)
+cd $temp
+git clone https://iankelling.org/git/basic-https-conf
+{ cat <<EOF
 ServerAdmin $mw_email
 RewriteEngine On
 # make the site's root url go to our main page
@@ -207,6 +205,7 @@ find -L $(readlink -f $mw) -name .htaccess \
     | while read line; do
     echo -e "<Directory ${line%/.htaccess}>\n $(< $line)\n</Directory>";
 done
+} | basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain
 cd
 rm -rf $temp
 # </source>