6713 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
A Holt	7508b770f0	Merge pull request #2081 from holta/phpmyadmin-5.0.0 ... phpMyAdmin 4.9.2 -> 5.0.0	2019-12-26 12:37:34 -05:00
A Holt	643e5ee740	phpMyAdmin 4.9.2 -> 5.0.0	2019-12-26 12:31:24 -05:00
A Holt	730ada875f	Merge pull request #322 from iiab/master ... sync from iiab:master	2019-12-26 12:30:00 -05:00
A Holt	03f297e312	Merge pull request #2076 from holta/sugarizer-req-node-12 ... Mandate Node.js 12.x for Sugarizer	2019-12-21 13:27:42 -05:00
A Holt	093a194ef2	Update install.yml	2019-12-21 13:27:02 -05:00
A Holt	118e438f70	Mandate Node.js 12.x for Sugarizer	2019-12-21 13:21:19 -05:00
A Holt	e342d0a88b	Merge pull request #2075 from holta/node-12 ... Node.js 10.x -> 12.x	2019-12-21 11:37:10 -05:00
A Holt	5ebcb46ba0	nodejs_version: 10.x -> 12.x	2019-12-21 11:31:06 -05:00
A Holt	7dae9c1c7d	Merge pull request #2074 from holta/nginx-home-page-double-slash ... NGINX home page double slash (should be single slash)	2019-12-21 11:21:40 -05:00
A Holt	79e1bb164b	http://box shouldn't redirect to http://box//home/	2019-12-20 09:33:26 -05:00
A Holt	a5ac22404a	Merge pull request #321 from iiab/master ... sync from iiab:master	2019-12-20 09:31:29 -05:00
A Holt	f79ce9d236	Merge pull request #2072 from holta/calibre-web-master ... Calibre-Web 0.6.4 -> master	2019-12-19 16:06:08 -05:00
A Holt	104611fae9	Calibre-Web 0.6.4 -> master	2019-12-19 16:00:58 -05:00
A Holt	b55d54094c	Merge pull request #2068 from jvonau/home_page ... Home page [NGINX should preserve box.lan etc, instead of redirecting to 172.18.96.1]	2019-12-19 11:43:52 -05:00
A Holt	8ae4e6bad2	Merge pull request #2071 from holta/mediawiki-1.34.0 ... MediaWiki 1.33.1 -> 1.34.0	2019-12-19 09:31:03 -05:00
A Holt	0d6e236e62	MediaWiki 1.33.1 -> 1.34.0	2019-12-19 09:26:55 -05:00
A Holt	7e7254c870	Merge pull request #2069 from holta/lokole-0.5.3 ... Lokole 0.5.2 -> 0.5.3	2019-12-17 12:47:30 -05:00
A Holt	279da3b9e2	Lokole 0.5.2 -> 0.5.3	2019-12-17 12:46:18 -05:00
Jerry Vonau	15db4a63cf	nginx - clean stale conf files	2019-12-17 09:49:08 -06:00
Jerry Vonau	1e47300e5b	nginx - restore iiab_home_url	2019-12-17 09:25:22 -06:00
Jerry Vonau	383f6194f7	nginx - moved to iiab-admin-console	2019-12-17 09:19:07 -06:00
Jerry Vonau	53f31b3662	nginx - merge usb-lib.conf, modules.conf into iiab.conf	2019-12-17 09:13:58 -06:00
A Holt	f19bef623f	Merge pull request #2066 from holta/etc-hosts-fix2 ... Alternative /etc/hosts.dnsmasq fix for PR #2051	2019-12-16 11:50:14 -05:00
A Holt	fba1c05f5a	Update hosts-dnsmasq.j2	2019-12-15 22:48:29 -05:00
A Holt	4db5e7b7ca	Merge pull request #320 from iiab/master ... sync from iiab:master	2019-12-15 22:45:32 -05:00
A Holt	be06a828e2	Merge pull request #2061 from jvonau/kill_python2 ... [Remove apt package avahi-discover as it...] drags in desktop and python2	2019-12-12 00:14:18 -05:00
A Holt	8610f3e074	Merge pull request #2060 from holta/sugarizer-server-v1.2.0 ... Sugarizer-Server v1.1.1 -> v1.2.0	2019-12-11 15:01:05 -05:00
Jerry Vonau	eeadbffce0	drags in desktop	2019-12-11 13:12:26 -06:00
A Holt	77676fd9a7	Sugarizer-Server v1.1.1 -> v1.2.0	2019-12-11 13:30:45 -05:00
A Holt	b891ac43e7	Merge pull request #2059 from holta/dnsmasq-cleanup ... Clean up PR #2051, clarifying remaining mods to /etc/hosts (now that dnsmasq uses /etc/hosts.dnsmasq instead)	2019-12-11 01:28:40 -05:00
A Holt	ed23daf69f	Update hosts.yml.deprecated	2019-12-11 01:26:29 -05:00
A Holt	fb394d7bb3	Update hosts.yml.deprecated	2019-12-11 01:26:04 -05:00
A Holt	3cb54e89df	Update hostname.yml	2019-12-11 01:25:33 -05:00
A Holt	d548ae0908	Update and rename hosts.yml to hosts.yml.deprecated	2019-12-11 01:21:03 -05:00
A Holt	1e5e6eb3a6	Update hostname.yml	2019-12-11 01:19:25 -05:00
A Holt	8a5f382c5e	Merge pull request #319 from iiab/master ... sync from iiab/iiab	2019-12-11 01:17:43 -05:00
A Holt	c92160be60	Merge pull request #2051 from jvonau/hosts_dnsmasq ... Use alternate hosts file /etc/hosts.dnsmasq [so dnsmasq DOESN'T send "127.0.0.1 box box.lan" from /etc/hosts to client machines]	2019-12-11 00:56:03 -05:00
A Holt	c827275cc3	Update hosts-dnsmasq.j2	2019-12-11 00:55:44 -05:00
A Holt	abde721ba0	Clarify purpose of /etc/hosts.dnsmasq	2019-12-11 00:54:33 -05:00
A Holt	08d36fda8f	Merge pull request #2058 from georgejhunt/osm-php-fix ... include a php clause in nginx conf	2019-12-10 17:09:28 -05:00
George Hunt	eea868b891	include a php clause in nginx conf	2019-12-10 20:52:10 +00:00
A Holt	cc90b6bb32	Merge pull request #2053 from holta/ansible-2.9.2 ... Recommend Ansible 2.9.1 -> 2.9.2	2019-12-09 18:19:55 -05:00
A Holt	4e9fcdb8fb	Merge pull request #2049 from holta/lokole-0.5.0 ... Lokole 0.4.4 -> 0.5.0 -> 0.5.2	2019-12-09 18:19:25 -05:00
A Holt	e3f9233561	Merge pull request #2047 from holta/phpmyadmin-4.9.2 ... phpMyAdmin 4.9.1 -> 4.9.2	2019-12-09 18:18:45 -05:00
A Holt	e58b9ae95f	Merge pull request #2054 from holta/kiwix-3.0.1-8 ... kiwix-tools 3.0.1-6 -> 3.0.1-8	2019-12-09 18:18:17 -05:00
A Holt	9f47fda30b	Merge pull request #2046 from holta/kolibri-fallback-options ... Explain how to find alternative Kolibri apt / .deb installers (e.g. when 0.12.9 fails to install)	2019-12-09 18:17:42 -05:00
A Holt	a4ff37fd46	Merge branch 'master' into kolibri-fallback-options	2019-12-09 18:16:34 -05:00
A Holt	0e56195478	Merge pull request #2052 from tim-moody/2042-new-py3-scripts ... Restructured iiab-make-kiwix-lib and iiab_lib	2019-12-09 12:15:13 -05:00
Tim Moody	93b0307aa4	add modules conf file	2019-12-09 12:10:02 -05:00
A Holt	eeec427f97	kiwix-tools 3.0.1-6 -> 3.0.1-8	2019-12-05 23:58:57 -05:00