update to latest snapshot

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index 6bbdf27aa544b6c3e54f8c2cf378e9b3dc6533b3..6acc2432992fd4978b098db1a47ce6a3237a3553 100644 (file)
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -35,6 +35,14 @@ Pre 5/2016 revisions ran Mediawiki 1.23, tested on Fedora 20 and Ubuntu 14.04.
 
 The most common route and the one taken by this site is buying a domain name from a site like namecheap, and a cheap vps from companies like linode or digital ocean. They have good getting started guides which mostly apply beyond their own sites.
 
+'''Install Certbot'''
+
+For debian jessie with backports:
+<source lang="bash">
+apt-get install --install-suggests jessie-backports certbot
+</source>
+For other distros, follow instructions at [https://certbot.eff.org/ certbot.eff.org].
+
 '''Email Setup'''
 
 Setting up email can be an involved process, and this guide assumes that a some program (usually postfix or exim) is implementing a functional sendmail interface. Mediawiki uses email with to send password reminders or notifications, and this guide includes cronjobs for updating mediawiki and doing backups which will send mail in the case of an error. Email is also the recommended way to get notifications of package updates which require manual steps such as restarting of services.
@@ -378,14 +386,11 @@ the apache config.
 temp=$(mktemp -d)
 cd $temp
 git_site=https://iankelling.org/git
-git clone $git_site/acme-tiny-wrapper
 l=$mw/../../logs
 mkdir -p $l
 
-acme-tiny-wrapper/acme-tiny-wrapper -t $mwdomain
-
 git clone $git_site/basic-https-conf
-{ cat <<EOF
+basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain <<EOF
 ServerAdmin $mw_email
 RewriteEngine On
 # make the site's root url go to our main page
@@ -397,7 +402,6 @@ find -L $(readlink -f $mw) -name .htaccess \
     | while read line; do
     echo -e "<Directory ${line%/.htaccess}>\n $(< $line)\n</Directory>";
 done
-} | basic-https-conf/apache-site -r ${mw%/*} - $mwdomain
 cd
 rm -rf $temp
 </source>

diff --git a/mw-setup-script b/mw-setup-script
index 1c356d4e587149fba6306c5994d677391b45a540..acc327fb5e8ecc925900d508bb5f4c7efeef437b 100755 (executable)
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -3,6 +3,9 @@
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
 set -x
 # <source lang="bash">
+apt-get install --install-suggests jessie-backports certbot
+# </source>
+# <source lang="bash">
 # identify if this is a debian based distro
 isdeb() { command -v apt &>/dev/null; }
 # tee unique. append each stdin line if it does not exist in the file
@@ -180,14 +183,11 @@ EOF
 temp=$(mktemp -d)
 cd $temp
 git_site=https://iankelling.org/git
-git clone $git_site/acme-tiny-wrapper
 l=$mw/../../logs
 mkdir -p $l
 
-acme-tiny-wrapper/acme-tiny-wrapper -t $mwdomain
-
 git clone $git_site/basic-https-conf
-{ cat <<EOF
+basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain <<EOF
 ServerAdmin $mw_email
 RewriteEngine On
 # make the site's root url go to our main page
@@ -199,7 +199,6 @@ find -L $(readlink -f $mw) -name .htaccess \
     | while read line; do
     echo -e "<Directory ${line%/.htaccess}>\n $(< $line)\n</Directory>";
 done
-} | basic-https-conf/apache-site -r ${mw%/*} - $mwdomain
 cd
 rm -rf $temp
 # </source>
@@ -511,25 +510,19 @@ x("MediaWiki:Sidebar", """* navigation
 # remove side panel
 # helpfull doc: https://www.mediawiki.org/wiki/Manual:Interface/Sidebar
 x("mediawiki:Common.css", """/* adjust sidebar to just be home link and up top  */
+/* adjust sidebar to just be home link and up top  */
 /* panel width increased to fit full wiki name. */
+/* selectors other than final id are for increasing priority of rule */
 div#mw-panel { top: 10px; padding-top: 0em; width: 20em }
 div#footer, #mw-head-base, div#content { margin-left: 1em; }
 #left-navigation { margin-left: 1em; }
 
 
 /* logo, and toolbar hidden */
-#p-logo, #p-tb.portal {
+#p-logo, div#mw-navigation div#mw-panel #p-tb {
    display:none;
 }
 
-/* make the font size smaller for the misc stuff */
-#p-personal {
-   font-size: 0.8em;
-}
-
-#footer-info {
-   font-size: 0.8em;
-}
 div#mw-content-text {
     max-width: 720px;
 }