X-Git-Url: https://iankelling.org/git/?p=mediawiki-setup;a=blobdiff_plain;f=mw-setup-script;fp=mw-setup-script;h=acc327fb5e8ecc925900d508bb5f4c7efeef437b;hp=1c356d4e587149fba6306c5994d677391b45a540;hb=2631a87ebcd3c7b743d968cf3d1f67fa2b0254db;hpb=10095af47126071a9def7bb38cb94908478c9f72

diff --git a/mw-setup-script b/mw-setup-script
index 1c356d4..acc327f 100755
--- 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;
 }