X-Git-Url: https://iankelling.org/git/?p=mediawiki-setup;a=blobdiff_plain;f=Mediawiki_Setup_Guide;h=6acc2432992fd4978b098db1a47ce6a3237a3553;hp=6bbdf27aa544b6c3e54f8c2cf378e9b3dc6533b3;hb=2631a87ebcd3c7b743d968cf3d1f67fa2b0254db;hpb=10095af47126071a9def7bb38cb94908478c9f72

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index 6bbdf27..6acc243 100644
--- 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>