Merge branch 'master' into master

2024-11-29 10:26:53 +01:00 · 2018-06-16 16:24:05 +02:00 · 2018-06-16 16:24:05 +02:00 · d838addc61
commit d838addc61
parent 6219971082 a1d93d6243
7 changed files with 138 additions and 52 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -1,16 +1,14 @@
 ## Contributing
-Please join us on [chat](https://chat.awesh.unknownplus.com/channel/awesome-selfhosted) to clarify any questions.
+Please open a new issue to clarify any questions, or post in the [General discussion issue](https://github.com/Kickball/awesome-selfhosted/issues/89).
 All guidelines for adding new software to the list are listed in [PULL_REQUEST_TEMPLATE.md](PULL_REQUEST_TEMPLATE.md).
 Other recommendations:
 - To add a new entry, [edit the README.md file](https://github.com/Kickball/awesome-selfhosted/edit/master/README.md) through Github's web interface or a text editor, and send a Pull Request.
 - See [Editing files in another user's repository](https://help.github.com/articles/editing-files-in-another-user-s-repository/), [Creating Pull Requests](https://help.github.com/articles/creating-a-pull-request/), [Using Pull Requests](https://help.github.com/articles/using-pull-requests/) for help on sending your patch.
 - A script to help you format new entries is available at (it requires `make` to be installed): `git clone`/[download](https://github.com/Kickball/awesome-selfhosted/archive/master.zip) and enter the repository, run `make add` and follow the instructions.
 - The list of contributors can be updated with `make contrib`. 
 - Software with no development activity for 6-12 months may be removed from the list.
 * The **syntax** for links is ``- [Name](http://homepage/) - Short description. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code)) `License` `Language` ``.
 * All projects must have their **license** and main server-side **language**/platform/requirement listed
 * Project descriptions must be less than 250 characters long.
 * Entries must be ordered alphabetically.
 * Entries in README.md must be [Free Software](https://en.wikipedia.org/wiki/Free_software).
 * Non-[Free](https://en.wikipedia.org/wiki/Free_software) software must be marked `⊘ Proprietary` next to the title, and added to [non-free.md](../non-free.md).
 * To **add an entry**: clone/[download](https://github.com/Kickball/awesome-selfhosted/archive/master.zip) and enter the repository, run `make add` and follow the instructions; or [edit the README.md file](https://github.com/Kickball/awesome-selfhosted/edit/master/README.md) directly. See [Editing files in another user's repository](https://help.github.com/articles/editing-files-in-another-user-s-repository/), [Creating Pull Requests](https://help.github.com/articles/creating-a-pull-request/), [Using Pull Requests](https://help.github.com/articles/using-pull-requests/) for help on sending your patch.
 * A  minimum of 3 entries are required to start a new category, otherwise add to the Misc/Other category.
 * The `⚠` character must be inserted for software that relies on a third party service the user does not control, e.g ``[Name](http://homepage/) `⚠` - Short description...``.
 * Check current [issues](https://github.com/Kickball/awesome-selfhosted/issues) and [Pull Requests](https://github.com/Kickball/awesome-selfhosted/pulls), as well as [closed issues/PRs](https://github.com/Kickball/awesome-selfhosted/pulls?utf8=%E2%9C%93&q=is%3Aclosed+).
 * The list of contributors can be updated with `make contrib`.
 * Software with no development activity for 6-12 months may be removed from the list.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -7,9 +7,10 @@ To ensure your PR is dealt with swiftly please check the following:
    ``- [Name](http://homepage/) - Short description, less than 250 characters. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code)) `License` `Language` ``
 - [ ] Your additions are ordered alphabetically.
- [ ] Your additions are [Free software](https://en.wikipedia.org/wiki/Free_software), or if not they have been added to [non-free](non-free.md).
+- [ ] Your additions are [Free software](https://en.wikipedia.org/wiki/Free_software), or if not they have been added to [non-free](non-free.md) and marked `⊘ Proprietary`.
 - [ ] Your additions are not already listed at [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin) (IT infrastructure management), [staticgen.com](https://www.staticgen.com/) or [staticsitegenerators.net](https://staticsitegenerators.net/) (static site generators).
 - [ ] Your additions have their `License` main server-side `Language`/platform/requirement listed.
 - [ ] Any licenses you have added are in our [list of licenses](https://github.com/Kickball/awesome-selfhosted/blob/master/README.md#list-of-licenses).
- [ ] You have searched the repository for any relevant [issues](https://github.com/Kickball/awesome-selfhosted/issues) or [PRs](https://github.com/Kickball/awesome-selfhosted/pulls).
+- [ ] You have searched the repository for any relevant [issues](https://github.com/Kickball/awesome-selfhosted/issues) or [PRs](https://github.com/Kickball/awesome-selfhosted/pulls), incluing closed ones.
- [ ] Any category you are creating has the minimum requirement of 3 items.
+- [ ] Any category you are creating has the minimum requirement of 3 items. If not, your addition may be inserted into `Misc/Other`.
 - [ ] Any software project you are adding to the list is actively maintained.
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -1,22 +1,23 @@
 Commits | Author 
 :---: | ---
-   527 | nodiscc <nodiscc@gmail.com>
+   649 | nodiscc <nodiscc@gmail.com>
   293 | Kickball <ed.kickball@hotmail.com>
-   163 | n8225 <n8225@users.noreply.github.com>
+   164 | n8225 <n8225@users.noreply.github.com>
-   114 | Andrew Rylatt <andyr207@users.noreply.github.com>
+   114 | Andrew Rylatt <AndyR207@users.noreply.github.com>
    35 | Kovah <mail@kovah.de>
    23 | cave beat <cave@cavebeat.org>
    17 | Thomas Dalichow <info@thomasdalichow.de>
    16 | Meitar M <meitarm@gmail.com>
    14 | Miguel Piedrafita <github@miguelpiedrafita.com>
    13 | jungle-boogie <sean@jungleboogie.me>
    12 | Alex <alex@maximum.guru>
    12 | Pe46dro <pietro@marangon.me>
     9 | Andrew Peng <pengc99@gmail.com>
     9 | DJCrashdummy <DJCrashdummy@users.noreply.github.com>
     9 | Joubert RedRat <eu+github@redrat.com.br>
     9 | Lance M <mightyfree@users.noreply.github.com>
     8 | CooperBarrett <anthony.lhuissier@openmailbox.org>
     8 | Ferdinand Mütsch <mail@ferdinand-muetsch.de>
     7 | Andrew Peng <pengc99@gmail.com>
     7 | Andrew Rylatt <arylatt@users.noreply.github.com>
     7 | Hammy Havoc <hammy@splitanatom.com>
     7 | Ilian <ugg.rock@gmail.com>
@ -27,16 +28,23 @@ Commits | Author
     6 | Quinn Comendant <quinn@strangecode.com>
     6 | Touhid Arastu <touhid.arastu@gmail.com>
     6 | cave <cavebeat@users.noreply.github.com>
     5 | James Cole <JC5@users.noreply.github.com>
     5 | Jean Champémont <jchampemont@users.noreply.github.com>
     5 | Karl Coelho <karl.coelho1@gmail.com>
     5 | Kevin Lin <developer@kevinlin.info>
     5 | Max Maischein <github@corion.net>
     5 | Mohammad Faisal <faisalhmohd@live.com>
     5 | Moti Korets <moti.kor@gmail.com>
     5 | Philip Kirkbride <kirkins@gmail.com>
     5 | mestaritonttu <mestaritonttu@mail.com>
     4 | /c² <cagataycali@icloud.com>
     4 | AlessioCasco <cascoalessio@gmail.com>
     4 | Alexandr Emelin <frvzmb@gmail.com>
     4 | AndrewCz <smacz42@users.noreply.github.com>
     4 | Chris McCormick <chris@mccormick.cx>
     4 | Cody Heimberger <cody.heimberger@printerlogic.com>
     4 | Colin Pokowitz <colin@cpdev.me>
     4 | Colin Pokowitz <colinpokowitz03@gmail.com>
     4 | Cory Gibbons <hello@corygibbons.com>
     4 | D <DL88250@gmail.com>
     4 | Dominik Pfaffenbauer <dominik@lineofcode.at>
@ -52,13 +60,16 @@ Commits | Author
     4 | MK <kohenkatz@gmail.com>
     4 | Marius Voila <marius.voila@gmail.com>
     4 | Rodolfo Berrios <inbox@rodolfoberrios.com>
     4 | Surgie Finesse <finesserus@gmail.com>
     4 | Valmik <mail@valmik.in>
     4 | bysslord <wxwlegend@gmail.com>
     4 | dattaz <taz@dattaz.fr>
     4 | dpfaffenbauer <dominik@lineofcode.at>
     4 | dyu <david.yu.ftw@gmail.com>
     4 | paddo <mail@patrickrichter.net>
     3 | Aguay <baraise.valentin@gmail.com>
     3 | Akhyar Amarullah <akhyrul@gmail.com>
     3 | BernsteinA <4685390+BernsteinA@users.noreply.github.com>
     3 | Burak Emre Kabakcı <emrekabakci@gmail.com>
     3 | Conor O'Callaghan <brioscaibriste@users.noreply.github.com>
     3 | Cédric Krier <cedk@users.noreply.github.com>
@ -70,8 +81,9 @@ Commits | Author
     3 | George C. Privon <privong@users.noreply.github.com>
     3 | Görkem Çetin <gc@count.ly>
     3 | Harvey Kandola <harvey@documize.com>
     3 | Ilya Pirozhenko <ilya.pir@gmail.com>
     3 | IrosTheBeggar <paul.sori@gmail.com>
-     3 | James Cole <JC5@users.noreply.github.com>
+     3 | Jiří Komárek <xkomczax@centrum.cz>
     3 | Kevin Hinterlong <kevinhinterlong@users.noreply.github.com>
     3 | Lee Watson <rev@revthefox.co.uk>
     3 | Leo Gaggl <leo@brightcookie.com.au>
@ -79,6 +91,8 @@ Commits | Author
     3 | Mariusz Kozakowski <11mariom+wordpress@gmail.com>
     3 | Martin Gontovnikas <martin@gon.to>
     3 | Mathieu Leplatre <mathieu@leplat.re>
     3 | Matt Baer <matt@baer.works>
     3 | Mitchell Urgero <info@urgero.org>
     3 | Morris Jobke <hey@morrisjobke.de>
     3 | Ovidiu Dan <zmarty@users.noreply.github.com>
     3 | Pavan Yara <yarapavan@gmail.com>
@ -92,8 +106,11 @@ Commits | Author
     3 | hebbet <pascal.herbert@gmail.com>
     3 | jungle-boogie <sean@rastasean.net>
     3 | moba <moba@users.noreply.github.com>
     3 | oknozor <paul.delafosse@protonmail.com>
     3 | pszlazak <pszlazak@users.noreply.github.com>
     3 | rett gerst <rettgerst@users.noreply.github.com>
     3 | xBytez <git@xbytez.io>
     2 | A. Cynic <chris@mretc.net>
     2 | Adminrezo (Nico Dewaele) <nico@adminrezo.fr>
     2 | Albert Cervera i Areny <albert@nan-tic.com>
     2 | Alexander Ryzhov <gtihub@ryzhov-al.ru>
@ -102,6 +119,7 @@ Commits | Author
     2 | Andrew Hayworth <hayworth@meraki.net>
     2 | Arik Fraimovich <arik@arikfr.com>
     2 | Bartłomiej Kurzeja <B3QL@users.noreply.github.com>
     2 | Ben Yanke <ben@benyanke.com>
     2 | Brendan Abolivier <contact@brendanabolivier.com>
     2 | Brian Morin <bdmorin@gmail.com>
     2 | Carlo F. Quaglia <cfq20@users.noreply.github.com>
@ -109,40 +127,50 @@ Commits | Author
     2 | Chris Missal <chris.missal@gmail.com>
     2 | Christopher Charbonneau Wells <cdubz@users.noreply.github.com>
     2 | Costin Moise <necenzurat@gmail.com>
     2 | Daniel Heath <daniel@heath.cc>
     2 | Daniel Ramirez Grave de Peralta <dxas90@gmail.com>
     2 | David Leonard <david@appliedtrust.com>
     2 | David Wayne Baxter <dbxt@users.noreply.github.com>
     2 | Derek Viera <ma.dmviera01@gmail.com>
     2 | Deryck <dhenson02@users.noreply.github.com>
     2 | Dillon Stadther <dlstadther@gmail.com>
     2 | Dominic Pratt <github@dominicpratt.de>
     2 | Eliot Berriot <contact@eliotberriot.com>
     2 | Feleg <fegul@users.noreply.github.com>
     2 | Felix Bartels <felix@host-consultants.de>
     2 | Gabin Aureche <gabin.aureche@live.fr>
     2 | Gabriel Cossette <gabriel.cossette@gmail.com>
     2 | Gonçalo Valério <dethos@users.noreply.github.com>
     2 | Greg Slepak <contact@taoeffect.com>
     2 | Greg V <greg@unrelenting.technology>
     2 | Henry Ruhs <info@redaxmedia.com>
     2 | Jake Breindel <j.breindel2@outlook.com>
     2 | Jan Soendermann <jan.soendermann+git@gmail.com>
     2 | Jorge E. Gomez <jorge@jorgee.net>
     2 | Joseph Dykstra <josephdykstra@gmail.com>
     2 | Julien Bisconti <veggiemonk@users.noreply.github.com>
     2 | Jérémie Astori <jeremie@astori.fr>
     2 | Keith Thibodeaux <kthibodeaux@peachtreebilling.com>
     2 | Kevin Lin <developer@kevinlin.info>
     2 | Kevin Vandenborne <kevin.vandenborne@gmail.com>
     2 | Klaus-Uwe Mitterer <info@klaus-uwe.me>
     2 | Madhu GB <github@madhugb.com>
     2 | Malte Kiefer <malte.kiefer@mailgermania.de>
     2 | Marc Laporte <marc@laporte.name>
     2 | Marien Fressinaud <dev@marienfressinaud.fr>
     2 | Markus M. Deuerlein <mdeuerlein@users.noreply.github.com>
     2 | MarkusMcNugen <marknewton5@gmail.com>
     2 | Martijn <mrtijn@riseup.net>
     2 | Massimo Santini <massimo.santini@gmail.com>
     2 | Matt Hazinski <matt@matthazinski.com>
     2 | Matthieu Aubry <matt@piwik.org>
     2 | Michael Tunnell <MichaelTunnell@users.noreply.github.com>
     2 | Mikael Peigney <Mika56@users.noreply.github.com>
     2 | Murali Govardhana <murali.govardhana@gmail.com>
     2 | Nick Busey <NickBusey@users.noreply.github.com>
     2 | Nicolas Carlier <n.carlier@nunux.org>
     2 | Oliver Giles <ohw.giles@gmail.com>
     2 | Patrik Ragnarsson <patrik@starkast.net>
-     2 | Pavel Lobashov <shockwavenn@gmail.com>
+     2 | Pavel Lobashov <ShockwaveNN@gmail.com>
     2 | Peter Demin <poslano@gmail.com>
     2 | Peter Ivanov <peter@microweber.com>
     2 | Phonic Mouse <phonicmouse@users.noreply.github.com>
@ -151,6 +179,7 @@ Commits | Author
     2 | Raymond Berger <RayBB@users.noreply.github.com>
     2 | ReadmeCritic <frankensteinbot@gmail.com>
     2 | Ricardo Torres <ricardo@rictorres.com.br>
     2 | Rid <shakeel.ridhwaan@gmail.com>
     2 | Rodolfo Berrios <rodolfo.berrios@gmail.com>
     2 | Roland Geider <roland@geider.net>
     2 | Ryan DeShone <rfdeshon@gmail.com>
@ -188,12 +217,15 @@ Commits | Author
     2 | tomc3 <wordoftheday003@gmail.com>
     2 | xy2z <xy2z@users.noreply.github.com>
     2 | yuche <i@yuche.me>
     2 | ziλa sarikaya <sarikayaziya@gmail.com>
     2 | znegva <znegva@users.noreply.github.com>
     2 | 王可森 <wangkesen@users.noreply.github.com>
     1 | Adam Johnson <me@adamj.eu>
     1 | Alashov Berkeli <yunus.alashow@gmail.com>
     1 | Alejandro Rodríguez <arcxyz@users.noreply.github.com>
     1 | Alex Bogdanovski <alex@erudika.com>
     1 | Alex Fornuto <alex@fornuto.com>
     1 | Alex Yumashev <33555768+alex-jitbit@users.noreply.github.com>
     1 | Alexandr Nesterenko <kuchaspama@gmail.com>
     1 | Alexandre Abita <xouabita@gmail.com>
     1 | Alexey Strokach <alex.strokach@utoronto.ca>
@ -202,9 +234,11 @@ Commits | Author
     1 | Andre <andre.lehmann@posteo.de>
     1 | Andrew Murray <radarhere@gmail.com>
     1 | Andrew Nesbitt <andrewnez@gmail.com>
     1 | Andrew Prokhorenkov <andrew.prokhorenkov@gmail.com>
     1 | Andrew Rylatt <andrew.rylatt@citrix.com>
     1 | Andrey <andrey200964@yandex.ru>
     1 | Andrey Kuznetsov <fear@loathing.in>
     1 | André Rodier <arodier@users.noreply.github.com>
     1 | Andy Olsen <andrewolsen@mail.adelphi.edu>
     1 | Angel Velasquez <angvp@archlinux.org>
     1 | Anton Troyanov <anton@troyanov.net>
@ -216,6 +250,7 @@ Commits | Author
     1 | Bas <mega@ioexception.at>
     1 | Beard of War <rebelgeek@blainsmith.com>
     1 | Ben <ben@rngr.org>
     1 | Benjamin Lange <benjamin.r.lange@gmail.com>
     1 | Bob Mottram <bob@robotics.uk.to>
     1 | Brett <brettex@hotmail.com>
     1 | Brian <bdmorin@users.noreply.github.com>
@ -228,10 +263,12 @@ Commits | Author
     1 | Chandan Rai <dev.chandan.rai@gmail.com>
     1 | Charles Barnes <cbarnes@bullhorn.com>
     1 | Chema <neo22s@gmail.com>
     1 | Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>
     1 | Christoph Kappestein <k42b3.x@gmail.com>
     1 | Christoph Wiechert <wio@psitrax.de>
     1 | Christophe Hamerling <christophe.hamerling@gmail.com>
     1 | Clément AUBIN <caubin@caubin.fr>
     1 | Colin <16247799+cpdevelops@users.noreply.github.com>
     1 | Colin Shea <colin@evaryont.me>
     1 | Craig Davison <craig@davison.io>
     1 | Cristian Menghi <cristian@menghi.biz>
@ -245,6 +282,7 @@ Commits | Author
     1 | Diego Molina <diemol@users.noreply.github.com>
     1 | Dirk Krause <dirkk0@googlemail.com>
     1 | Dmitriy Volkov <wldhx+vcs+github_com@wldhx.me>
     1 | Dmitry Khomutov <poisoncorpsee@gmail.com>
     1 | Doğan Çelik <dogancelik@users.noreply.github.com>
     1 | Dražen Lučanin <kermit666@gmail.com>
     1 | Ed Tewiah <etewiah@hotmail.com>
@ -269,14 +307,17 @@ Commits | Author
     1 | Icantcodeatall <francois.lachese@me.com>
     1 | Igor Antun <IgorAntun@users.noreply.github.com>
     1 | Igor Petrov <garik.piton@gmail.com>
     1 | Ilya Pirozhenko <ilya.pir@gmail.com>
     1 | Ivan Krutov <vania-pooh@vania-pooh.com>
     1 | Izac Lorimer <izaclorimer@users.noreply.github.com>
     1 | Jack <jackdev@mailbox.org>
     1 | Jakob Gillich <jakob@gillich.me>
     1 | James Mills <prologic@shortcircuit.net.au>
     1 | Jan <jayphizzle@users.noreply.github.com>
     1 | Jannik Anker <jannikanker@users.noreply.github.com>
     1 | Janos Dobronszki <dobronszki@gmail.com>
     1 | Jarek Lipski <pub@loomchild.net>
     1 | Jay Williams <jay@myd3.com>
     1 | Jay Yu <GitHubGeek@users.noreply.github.com>
     1 | Jean Menezes da Rocha <jean@menezesdarocha.info>
     1 | Jeremiah Marks <jeremiah@jlmarks.org>
     1 | Joel Calado <joelcalado@gmail.com>
@ -288,18 +329,23 @@ Commits | Author
     1 | Julien Reichardt <jul.reich43@opmbx.org>
     1 | Justin Clift <justin@postgresql.org>
     1 | Justin O'Reilly <justin@oreilly.me>
     1 | KarloLuiten <github@karloluiten.nl>
     1 | Ketrel <webmaster@krahs-emag.com>
     1 | Kevin Lin <LINKIWI@users.noreply.github.com>
     1 | Keyhaku <jones@bious.fr>
     1 | Kieran <kieran.brahney@gmail.com>
     1 | Kim Jahn <gitfuckinghub@maisspace.org>
     1 | Konstantin Sorokin <kvs@sigterm.ru>
     1 | Kukielka <philipp_kutyla@gmx.de>
     1 | Kyle Farwell <m@kfarwell.org>
     1 | Kyle Stetz <kylestetz@gmail.com>
     1 | LB (Ben Johnston) <mail@lb.ee>
     1 | Lescaudron Mathieu <mathieu@lescaudron.com>
     1 | Liran Tal <liran.tal@gmail.com>
     1 | Marcin Karpezo <m.karpezo@nencki.gov.pl>
     1 | Marco Dickert <dickert.marco@gmail.com>
     1 | Marcus Ramberg <marcus@nordaaker.com>
     1 | Mark Ide <git@cranstonide.com>
     1 | Mark Ide <mark@cranstonide.com>
     1 | Mark Railton <mark@markrailton.com>
     1 | Martin Malinda <malindacz@gmail.com>
@ -308,8 +354,10 @@ Commits | Author
     1 | Matt Lee <mattl@users.noreply.github.com>
     1 | Matteo Piccina <matteo@beiphone.it>
     1 | Matthew Dews <matthew-dews@users.noreply.github.com>
     1 | Matthew East <matthew@mattheweast.me>
     1 | Michael Barrow <michael@barrow.me>
     1 | Michael Burns <michael@mirwin.net>
     1 | Michael Malura <github@malura.me>
     1 | Michael van Tricht <mvantricht@expandonline.nl>
     1 | Michael van Tricht <swordbeta@users.noreply.github.com>
     1 | Mike Goodwin <xenithorb@users.noreply.github.com>
@ -326,10 +374,13 @@ Commits | Author
     1 | Paolo Pustorino <stickgrinder@gmail.com>
     1 | Pau Kiat Wee <paukiatwee@gmail.com>
     1 | Paul <paul@rosanbo.com>
     1 | Pavlo Vodopyan <pavel.vodopyan@gmail.com>
     1 | Paweł Kapała <bylek77@gmail.com>
     1 | Peter Brunner <pbrunner@gmail.com>
     1 | Peter van den Hurk <runical1991@gmail.com>
     1 | Phill <phill@formbet.co.uk>
     1 | Phonic Mouse <phonicmouse@gmai.com>
     1 | Prahalad Belavadi <prahaladbelavadi@gmail.com>
     1 | Rafael Milewski <Milewski@users.noreply.github.com>
     1 | Remi Rampin <remirampin@gmail.com>
     1 | Remy Adriaanse <remy@adriaanse.it>
@ -338,8 +389,11 @@ Commits | Author
     1 | Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
     1 | RussellAult <RussellAult@users.noreply.github.com>
     1 | Ryan Halliday <ry167@ry167.com>
     1 | Ryan Noelk <ryannoelk@gmail.com>
     1 | Sahin Boydas <sahin@movielala.com>
     1 | Salvatore Gentile <SalGnt@users.noreply.github.com>
     1 | Sam Wilson <sam@samwilson.id.au>
     1 | Samuel Garneau <sam@garno.me>
     1 | Scott Humphries <sscotth@users.noreply.github.com>
     1 | Senan Kelly <senan.f.b.kelly+github@gmail.com>
     1 | Sergey Bronnikov <sergeyb@bronevichok.ru>
@ -355,23 +409,30 @@ Commits | Author
     1 | The Scorpion <tehscorpion@users.noreply.github.com>
     1 | Thorsten Rinne <thorsten@phpmyfaq.de>
     1 | Tim Allingham <tim@timallingham.net>
     1 | Tobias Diekershoff <tobias.diekershoff@gmx.net>
     1 | Tobias Kunze <rixx@cutebit.de>
     1 | Tobias Zeising <tobias.zeising@aditu.de>
     1 | Tom Hacohen <tom@stosb.com>
     1 | Tommy Ku <tommyku@users.noreply.github.com>
     1 | Viktor Geringer <devfakeplus@googlemail.com>
     1 | Yurii Rashkovskii <yrashk@gmail.com>
     1 | axeloz <axel@mabox.eu>
     1 | benmaynard11 <allowin-217941-github@vhost244.maynardnetworks.com>
     1 | bricej13 <bricej13@gmail.com>
     1 | bysslord <wxwlegend@gmail.com>
     1 | cbdev <cb@cbcdn.com>
     1 | cpdev <cpdevelops@users.noreply.github.com>
     1 | dimqua <dimqua@lavabit.com>
     1 | disk0x <mdtha@tutanota.com>
     1 | domainzero <domainzero@users.noreply.github.com>
     1 | dsx <free.robots@gmail.com>
     1 | ePirat <epirat07@gmail.com>
     1 | emeric <itmfr@yahoo.fr>
     1 | evitalis <evitalis@users.noreply.github.com>
     1 | florianl <florianl@users.noreply.github.com>
     1 | foorb <foorb@users.noreply.github.com>
     1 | ghaseminya <ghaseminya@gmail.com>
     1 | golangci <35628013+golangci@users.noreply.github.com>
     1 | ice-92 <ice-92@users.noreply.github.com>
     1 | ilsi <ilsi@users.noreply.github.com>
     1 | itsnotv <itsnotv@users.noreply.github.com>
     1 | jake <jake@diesel>
@ -382,7 +443,6 @@ Commits | Author
     1 | macmusz <m.muszytowski@simplito.com>
     1 | memorex258 <phillip.a.brown@live.com>
     1 | mertinop <martin.santibanez.a@gmail.com>
     1 | mestaritonttu <mestaritonttu@mail.com>
     1 | mrkpl125 <33229813+mrkpl125@users.noreply.github.com>
     1 | n2i <xuansamdinh.n2i@gmail.com>
     1 | nodomain <ff@nodomain.cc>
@ -392,9 +452,11 @@ Commits | Author
     1 | railscard <railscard@gmail.com>
     1 | sc0repi0 <sc0repi0@gmx.de>
     1 | skarphet <skarphet@users.noreply.github.com>
     1 | sqozz <sqozz@geekify.de>
     1 | steven jacobs <stjacobs@fastmail.fm>
     1 | stevesbrain <stevesbrain@users.noreply.github.com>
     1 | t1st3 <contact@tiste.org>
     1 | teaberryy <ekisneels@gmail.com>
     1 | timbe16 <timbe16@users.noreply.github.com>
     1 | trebonius0 <trebonius@worldofwargraphs.com>
     1 | ttoups <ich@timotoups.de>
@ -405,3 +467,4 @@ Commits | Author
     1 | xuansamdinh <xuansamdinh.n2i@gmail.com>
     1 | zotlabs <mike@macgirvin.com>
     1 | Руслан Корнев <oganer@gmail.com>
     1 | ProfessorLogout <Marco Kamner>
--- a/7
+++ b/7
@ -1,4 +1,7 @@
-#Check for changes to README.md
+# Danger CI configuration file
 # https://danger.systems/guides/getting_started.html
 # Check for changes to README.md
 has_readme_changes = git.modified_files.include?("README.md")
 # Ensure there is a summary for a pull request
@ -8,7 +11,7 @@ fail 'Please provide a summary in the Pull Request description' if github.pr_bod
 warn 'Please check PR guidelines and check the boxes.' if github.pr_body.include? '- [ ]'
 # Warn if pull request is not updated
-warn 'Please update the Pull Request title to contain the script name' if github.pr_title.include? 'Update README.md'
+warn 'Please provide a descriptive title for the Pull Request' if github.pr_title.include? 'Update README.md'
 # Warn when there are merge commits in the diff
 warn 'Please rebase to get rid of the merge commits in this Pull Request' if git.commits.any? { |c| c.message =~ /^Merge branch 'master'/ }
--- a/2
+++ b/2
@ -26,7 +26,7 @@ listlicenses:
 	@sed -n -e '/BEGIN SOFTWARE LIST/,/END SOFTWARE LIST/ p' README.md | egrep --only-matching '([Aa0-Zz9]|\s|\.|-)*` `' README.md | sort --unique
 syntaxerrors:
-	@echo -e "\n Syntax errors:" 
+	@echo -e "\nSyntax errors:" 
 	@! sed -n -e '/BEGIN SOFTWARE LIST/,/END SOFTWARE LIST/ p' README.md | egrep  '\)\(|``|\)`'
 contrib:
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Awesome-Selfhosted
-[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [![](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://chat.awesh.unknownplus.com/channel/awesome-selfhosted)
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 Selfhosting is the process of locally hosting and managing applications instead of renting from SaaS providers.
@ -44,6 +44,7 @@ See [Contributing](.github/CONTRIBUTING.md).
  - [Distributed filesystems](#distributed-filesystems)
  - [File transfer/synchronization](#file-transfersynchronization)
  - [Peer-to-peer filesharing](#peer-to-peer-filesharing)
  - [Object storage/file servers](#object-storagefile-servers)
  - [Single-click/drag-n-drop upload](#single-clickdrag-n-drop-upload)
  - [Web based file managers](#web-based-file-managers)
 - [Games](#games)
@ -53,6 +54,7 @@ See [Contributing](.github/CONTRIBUTING.md).
 - [Learning and Courses](#learning-and-courses)
 - [Maps and Global Positioning System (GPS)](#maps-and-global-positioning-system-gps)
 - [Media Streaming](#media-streaming)
  - [Multimedia Streaming](#multimedia-streaming)
  - [Audio Streaming](#audio-streaming)
  - [Video Streaming](#video-streaming)
 - [Misc/Other](#miscother)
@ -104,6 +106,7 @@ _Web Analytics_
 - [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically. ([Source Code](https://github.com/eldy/awstats)) `GPL-3.0` `Perl`
 - [Countly](https://count.ly) - Real time mobile and web analytics, crash reporting and push notifications platform. ([Source Code](https://github.com/countly)) `AGPL-3.0` `Javascript`
 - [Druid](http://druid.io/) - Distributed, column-oriented, real-time analytics data store. ([Source Code](https://github.com/druid-io/druid/)) `Apache-2.0` `Java`
 - [Fathom Analytics](https://usefathom.com) - Simple & trustworthy website analytics. ([Source Code](https://github.com/usefathom/fathom)) `MIT` `Go`
 - [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal. ([Source Code](https://github.com/allinurl/goaccess)) `GPL-2.0` `C`
 - [Matomo](https://matomo.org/) - Leading open-source analytics platform that gives you more than just powerful analytics, formerly known as Piwik. ([Source Code](https://github.com/matomo-org/)) `GPL-3.0` `PHP`
 - [Open Web Analytics](http://www.openwebanalytics.com/) - Google Analytics and Piwik alternative. ([Source Code](https://github.com/padams/Open-Web-Analytics/)) `GPL-2.0` `PHP`
@ -226,6 +229,7 @@ _CalDAV or CardDAV servers_
 - [EteSync Server](https://www.etesync.com) - End-to-end encrypted and journaled personal information server supporting calendar and contact data, offering its own clients. ([Source Code](https://github.com/etesync/server-skeleton)) `AGPL-3.0` `Python/Django`
 - [Radicale](http://radicale.org/) - Simple calendar and contact server with extremely low administrative overhead. ([Source Code](https://github.com/Kozea/Radicale)) `GPL-3.0` `Python`
 - [SabreDAV](http://sabre.io/) - Open source CardDAV, CalDAV, and WebDAV framework and server. ([Source Code](https://github.com/sabre-io/dav)) `MIT` `PHP`
 - [Xandikos](https://www.xandikos.org/) - Open source CardDAV, CalDAV and WebDAV server with minimal administrative overhead, backed by a Git repository. ([Source Code](https://github.com/jelmer/xandikos)) `GPL-3.0` `Python`
 _CalDAV or CardDAV clients._
@ -240,7 +244,6 @@ _CalDAV or CardDAV clients._
 ### Custom communication systems
 - [Actor](https://actor.im/) - Actor is a fast, open source messaging platform with rich mobile and web clients. ([Demo](https://app.actor.im), [Source Code](https://github.com/actorapp/actor-platform)) `AGPL-3.0` `Scala`
 - [Broid](https://broid.ai) - Broid enables rich conversations on all messaging channels within a single schema integration using W3C standards. ([Demo](https://www.broid.ai), [Source Code](https://github.com/broidHQ/integrations)) `AGPL-3.0` `Nodejs`
 - [Centrifugo](https://github.com/centrifugal/centrifugo) - Language-agnostic real-time messaging (Websocket or SockJS) server. ([Demo](https://github.com/centrifugal/centrifugo#demo)) `MIT` `Go`
 - [Cherry](https://github.com/rafael-santiago/cherry) - Tiny webchat server. `GPL-2.0` `Go`
@ -390,6 +393,7 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
 - [Abilian SBE](https://github.com/abilian/abilian-sbe) - Open Source Collaboration and Social Networking framework and platform. `LGPL-2.1` `Python`
 - [Anahita](https://www.getanahita.com/) - Open Source Social Networking Framework and Platform. ([Source Code](https://github.com/anahitasocial)) `GPL-3.0` `PHP`
 - [bbPress](https://bbpress.org/) - bbPress is forum software with a twist from the creators of WordPress. Easily setup discussion forums inside your WordPress.org powered site. ([Source Code](https://bbpress.trac.wordpress.org/browser/trunk)) `GPL-2.0` `PHP`
 - [Bootcamp](http://trybootcamp.vitorfs.com) - Enterprise social network. ([Source Code](https://github.com/vitorfs/bootcamp)) `MIT` `Python`
 - [Buddycloud](http://buddycloud.com/) - Tools, libraries, services and a community to build user-to-user, group and social messaging into your app. Saves time. Scales up. Supports you. ([Source Code](https://github.com/buddycloud)) `Apache-2.0` `Java`
 - [BuddyPress](https://buddypress.org/about/) - Powerful plugin that takes your WordPress.org powered site beyond the blog with social-network features like user profiles, activity streams, user groups, and more. ([Source Code](https://buddypress.svn.wordpress.org/trunk/)) `GPL-2.0` `PHP`
@ -412,6 +416,7 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_
 - [MyBB](http://www.mybb.com/) - Free, extensible forum software package. ([Source Code](https://github.com/mybb/mybb)) `LGPL-3.0` `PHP`
 - [Newebe](http://newebe.org/) - Distributed Social Network. ([Source Code](https://github.com/gelnior/newebe)) `AGPL-3.0` `Python`
 - [NodeBB](https://nodebb.org/) - Node.js based forum software built for the modern web. ([Source Code](https://github.com/NodeBB/NodeBB)) `GPL-3.0` `Nodejs`
 - [Pleroma](https://pleroma.social) - Federated microblogging server, Mastodon, GNU social, & ActivityPub compatible.([Source Code](https://git.pleroma.social/pleroma/pleroma)) `AGPL-3.0` `Elixir`
 - [orangeforum](http://www.goodoldweb.com/) - Orange Forum is an easy to deploy forum that has minimal dependencies and uses very little javascript. ([Demo](https://groups.goodoldweb.com/), [Source Code](https://github.com/s-gv/orangeforum)) `BSD-3-Clause` `Go`
 - [OSSN](https://www.opensource-socialnetwork.org/) - Open Source Social Network (OSSN) is a social networking software written in PHP. It allows you to make a social networking website and helps your members build social relationships, with people who share similar professional or personal interests. ([Source Code](https://github.com/opensource-socialnetwork/opensource-socialnetwork)) `GPL-2.0` `PHP`
 - [Oxwall](http://www.oxwall.org/) - Oxwall is used for a wide range of projects starting from family sites and custom social networks to collaboration tools and enterprise community solutions. ([Source Code](https://bitbucket.org/oxwall/public)) `CPAL-1.0` `PHP`
@ -461,6 +466,7 @@ _[Extensible Messaging and Presence Protocol](https://en.wikipedia.org/wiki/XMPP
 - [OpenCFP](https://github.com/opencfp/opencfp) - OpenCFP is a PHP-based conference talk submission system. `MIT` `PHP`
 - [OpenConferenceWare](http://openconferenceware.org/) - Open source web application for supporting conference-like events. This customizable, general-purpose platform provides proposals, sessions, schedules, tracks, user profiles. ([Source Code](https://github.com/osbridge/openconferenceware)) `MIT` `Ruby`
 - [osem](http://osem.io/) - Event management tailored to free Software conferences. ([Demo](http://demo.osem.io/), [Source Code](https://github.com/openSUSE/osem)) `MIT` `Ruby`
 - [pretalx](https://pretalx.org) - Web-based event management, including running a Call for Papers, reviewing submissions, and scheduling talks. Exports and imports for various related tools. ([Source Code](https://github.com/pretalx/pretalx)) `Apache-2.0` `Python`
 ## Content Management Systems (CMS)
@ -482,7 +488,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi
 - [eLabFTW](http://www.elabftw.net) - Online lab notebook for research labs. Store experiments, use a database to find reagents or protocols, use trusted timestamping to legally timestamp an experiment, export as pdf or zip archive, share with collaborators…. ([Demo](https://demo.elabftw.net), [Source Code](https://github.com/elabftw/elabftw)) `AGPL-3.0` `PHP`
 - [GetSimple CMS](http://get-simple.info/) - The Simplest Content Management System. Ever. ([Source Code](https://github.com/GetSimpleCMS/GetSimpleCMS)) `GPL-3.0` `PHP`
 - [ImpressPages CMS](https://www.impresspages.org/) - Easy code meets easy admin. ([Demo](https://www.impresspages.org/demo), [Source Code](https://github.com/impresspages/ImpressPages)) `GPL-3.0/MIT` `PHP`
- [Joomla!](https://www.joomla.org/) - Advanced Content Management System (CMS). ([Source Code](http://joomlacode.org/gf/project/joomla/scmsvn/)) `GPL-1.0` `PHP`
+- [Joomla!](https://www.joomla.org/) - Advanced Content Management System (CMS). ([Source Code](https://github.com/joomla/joomla-cms)) `GPL-2.0` `PHP`
 - [KeystoneJS](http://keystonejs.com/) - CMS and Web Application Platform. ([Demo](http://demo.keystonejs.com/), [Source Code](https://github.com/keystonejs/keystone)) `MIT` `Nodejs`
 - [MODX](http://modx.com/) - MODX is an advanced content management and publishing platform. The current version is called 'Revolution'. ([Source Code](https://github.com/modxcms/revolution)) `GPL-2.0` `PHP`
 - [Neos](https://www.neos.io) - Neos or TYPO3 Neos (for version 1) is a modern, open source CMS. ([Source Code](https://git.typo3.org/Packages/TYPO3.Neos.git)) `GPL-3.0` `PHP`
@ -551,8 +557,10 @@ See https://github.com/n1trux/awesome-sysadmin#dns
 - [CUPS](https://www.cups.org/) - The Common Unix Print System uses Internet Printing Protocol (IPP) to support printing to local and network printers. ([Source Code](https://www.cups.org/software.php)) `GPL-2.0` `C`
 - [EdPaper](https://github.com/Edraens/EdPaper) - PDF organizer with users management. `MIT` `PHP`
 - [Mayan EDMS](http://www.mayan-edms.com) - Free Open Source Electronic Document Management System. An electronic vault for your documents with preview generation, OCR, and automatic categorization among other features. ([Source Code](https://gitlab.com/mayan-edms/mayan-edms)) `Apache-2.0` `Python`
 - [Paperless](https://github.com/danielquinn/paperless) - Scan, index, and archive all of your paper documents. `GPL-3.0` `Python`
 - [SANE Network Scanning](http://sane-project.org/) - Allow remote clients to access image acquisition devices (scanners) available on the local host. ([Source Code](http://www.sane-project.org/cvs.html)) `GPL-2.0` `C`
 - [Sismics Docs](https://www.sismicsdocs.com/) - Lightweight document management system packed with all the features you can expect from big expensive solutions. ([Demo](https://www.sismicsdocs.com/#!/demo), [Source Code](https://github.com/sismics/docs)) `GPL-2.0` `Java`
 ## E-books and Integrated Library Systems (ILS)
@ -638,7 +646,7 @@ See https://github.com/n1trux/awesome-sysadmin#distributed-filesystems
 #### File transfer/synchronization
- [Git Annex](http://git-annex.branchable.com) - File synchronization between computers, servers, external drives. ([Source Code](https://github.com/joeyh/git-annex)) `GPL-3.0` `Haskell`
+- [Git Annex](https://git.joeyh.name/git/git-annex.git/) - File synchronization between computers, servers, external drives. ([Source Code](https://github.com/joeyh/git-annex)) `GPL-3.0` `Haskell`
 - [Kinto](https://kinto.readthedocs.org) - Kinto is a minimalist JSON storage service with synchronisation and sharing abilities. ([Source Code](https://github.com/Kinto)) `Apache-2.0` `Python`
 - [Nextcloud](https://nextcloud.com/) - Access and share your files, calendars, contacts, mail and [more](https://apps.nextcloud.com/) from any device, on your terms. ([Demo](https://demo.nextcloud.com/), [Source Code](https://github.com/nextcloud/server)) `AGPL-3.0` `PHP`
 - [OpenSSH/SFTP](http://www.openssh.com/) - Secure File Transfer Program. ([Source Code](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh)) `BSD` `C`
@ -668,6 +676,11 @@ See https://github.com/n1trux/awesome-sysadmin#distributed-filesystems
 - [Reep](https://reep.io) - In-browser peer-to-peer file transfer and streaming made easy. ([Source Code](https://github.com/KodeKraftwerk/reepio)) `GPL-2.0` `Nodejs`
 - [Transmission](https://transmissionbt.com/) - Fast, easy, Free Bittorrent client. ([Source Code](https://github.com/transmission/transmission)) `GPL-3.0` `C`
 #### Object storage/file servers
 - [Minio](https://minio.io/) - Minio is an open source object storage server compatible with Amazon S3 APIs. ([Source Code](https://github.com/minio/minio)) `Apache-2.0` `Go`
 - [Zenko CloudServer](https://www.zenko.io/cloudserver) - Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol. ([Source Code](https://github.com/scality/S3)) `Apache-2.0` `Nodejs`
 #### Single-click/drag-n-drop upload
 - [BoZoN](https://github.com/broncowdd/BoZoN) - Minimalist Drag and drop file sharing app. `AGPL-3.0` `PHP`
@ -681,7 +694,6 @@ See https://github.com/n1trux/awesome-sysadmin#distributed-filesystems
 - [linx](https://github.com/andreimarcu/linx-server) - File sharing application and pastebin with API, auto-expiry, deletion keys, and web seed support. ([Demo](https://linx.li/)) `GPL-3.0` `Go`
 - [lufi](https://git.framasoft.org/luc/lufi) - Let's Upload that FIle, client-side encrypted. ([Demo](https://demo.lufi.io), [Source Code](https://git.framasoft.org/luc/lufi/tree/master)) `AGPL-3.0` `Perl`
 - [lutim](https://github.com/ldidry/lutim) - Let's Upload That Image. `AGPL-3.0` `Perl`
 - [Minio](https://minio.io/) - Store photos, videos, VMs, containers, log files, or any blob of data as objects. ([Source Code](https://github.com/minio/minio)) `Apache-2.0` `Go`
 - [Nimbus](https://github.com/ethanal/nimbus) - Drag-and-drop shortlink file sharer for OS X. `MIT` `Python`
 - [OnionShare](https://github.com/micahflee/onionshare) - Securely and anonymously share a file of any size. `GPL-2.0` `Python`
 - [PictShare](https://www.pictshare.net/) - PictShare is a multi lingual, open source image hosting service with a simple resizing and upload API. ([Demo](https://www.pictshare.net/), [Source Code](https://github.com/chrisiaut/pictshare)) `Apache-2.0` `PHP`
@ -754,7 +766,6 @@ _Command-line file upload_
 - [HRCloud2](https://www.honestrepair.net/index.php/hrcloud2/) - Full-featured home hosted Cloud Drive, Personal Assistant, App Launcher, File Converter, Streamer, Share Tool and more. ([Source Code](https://github.com/zelon88/HRCloud2)) `GPL-3.0` `PHP`
 - [Kolab](https://kolab.org/) - Kolab community is a unified communication and collaboration system. ([Source Code](https://git.kolab.org/)) `GPL-2.0/LGPL-2.1/GPL-3.0` `C++/Python/PHP`
 - [Kopano](https://kopano.com/) - Groupware suite including e-mail, calendars, tasks, todos and notes. Featuring a modern WebApp, DeskApp and mobile access over Z-Push/ActiveSync. ([Demo](http://demo.kopano.com), [Source Code](https://stash.kopano.io)) `AGPL-3.0` `C/Python/PHP`
 - [Mayan EDMS](http://www.mayan-edms.com) - Free Open Source Electronic Document Management System. An electronic vault for your documents with preview generation, OCR, and automatic categorization among other features. ([Demo](http://demo.mayan-edms.com), [Source Code](https://gitlab.com/mayan-edms/mayan-edms)) `Apache-2.0` `Python`
 - [Openmeetings](https://openmeetings.apache.org/index.html) - Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools using API functions of the Red5 Streaming Server for Remoting and Streaming. ([Source Code](https://openmeetings.apache.org/source-repository.html)) `Apache-2.0` `Java`
 - [SOGo](https://sogo.nu/) - SOGo offers multiple ways to access the calendaring and messaging data. CalDAV, CardDAV, GroupDAV, as well as ActiveSync, including native Outlook compatibility and Web interface. ([Demo](http://demo.sogo.nu/SOGo/), [Source Code](https://github.com/inverse-inc/sogo)) `LGPL-2.1` `Objective-C`
 - [Tine 2.0](https://www.tine20.org) - Contacts, Calendar, Tasks, WebDAV, ActiveSync, VOIP, Mail-Client, CRM, Sales, Projects, Timetracker. ([Demo](https://demo.tine20.net), [Source Code](https://packages.tine20.com/maintenance/source/)) `AGPL-3.0/Other` `PHP`
@ -807,6 +818,15 @@ _Command-line file upload_
 See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https://en.wikipedia.org/wiki/Comparison_of_streaming_media_systems>
 ### Multimedia Streaming
 - [Darwin Streaming Server](https://macosforge.github.io/dss/) - High performance server for streaming QuickTime and MPEG-4 media over RTP and RTSP protocols. Originated as Apple’s QTSS. ([Source Code](https://github.com/macosforge/dss)) `APSL-2.0` `C++`
 - [Flumotion](http://flumotion.net/) - Streaming media server with intuitive graphical administration tools. ([Source Code](https://github.com/Flumotion/flumotion)) `LGPL-2.1` `Python`
 - [homehost](https://github.com/ridhwaans/homehost) `⚠` - self-hosted React + Redux app that streams your media collection (music, movies, books, podcasts, comics etc)  `MIT` `Nodejs`
 - [MistServer](http://mistserver.org/) - Streaming media server that works well in any streaming environment. ([Source Code](https://github.com/DDVTECH/mistserver)) `AGPL-3.0` `C++`
 - [ReadyMedia](http://sourceforge.net/projects/minidlna/) - Simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients. `GPL-2.0` `C`
 - [Rygel](https://wiki.gnome.org/action/show/Projects/Rygel) - Rygel is a UPnP AV MediaServer that allows you to easily share audio, video, and pictures. Media player software may use Rygel to become a MediaRenderer that may be controlled remotely by a UPnP or DLNA Controller. `GPL-3.0` `C`
 ### Audio Streaming
 - [Ampache](http://ampache.org/) - Web based audio/video streaming application. ([Demo](http://play.dogmazic.net/), [Source Code](https://github.com/ampache/ampache)) `AGPL-3.0` `PHP`
@ -837,20 +857,17 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [crtmpserver](https://packages.debian.org/stable/crtmpserver) - High performance RTMP/RTSP streaming server. `GPL-3.0` `C++`
 - [CyTube](https://github.com/calzoneman/sync) - CyTube is a web application providing media synchronization, chat, and more for an arbitrary number of channels. ([Demo](http://cytu.be)) `MIT` `Nodejs`
 - [Darwin Streaming Server](https://macosforge.github.io/dss/) - High performance server for streaming QuickTime and MPEG-4 media over RTP and RTSP protocols. Originated as Apple’s QTSS. ([Source Code](https://github.com/macosforge/dss)) `APSL-2.0` `C++`
 - [Emby](https://emby.media/) - Home media server supporting both DLNA and DIAL (Chromecast) devices out-of-the-box. ([Source Code](https://github.com/MediaBrowser/Emby)) `GPL-2.0` `C#`
 - [Flumotion](http://flumotion.net/) - Streaming media server with intuitive graphical administration tools. ([Source Code](https://github.com/Flumotion/flumotion)) `LGPL-2.1` `Python`
 - [Hellowlol HTPC Manager fork](https://github.com/Hellowlol/HTPC-Manager) - Fully responsive interface to manage all your favorite media on your HTPC. ([Source Code](https://github.com/styxit/HTPC-Manager)) `MIT` `Python`
- [Icecast 2](http://www.icecast.org/) - streaming audio/video server which can be used to create an Internet radio station or a privately running jukebox and many things in between. ([Source Code](https://git.xiph.org/?p=icecast-server.git;a=summary),[Clients](https://www.icecast.org/apps/)) `GPL-2.0` `C`
+- [Icecast 2](http://www.icecast.org/) - streaming audio/video server which can be used to create an Internet radio station or a privately running jukebox and many things in between. ([Source Code](https://git.xiph.org/?p=icecast-server.git;a=summary), [Clients](https://www.icecast.org/apps/)) `GPL-2.0` `C`
 - [MistServer](http://mistserver.org/) - Streaming media server that works well in any streaming environment. ([Source Code](https://github.com/DDVTECH/mistserver)) `AGPL-3.0` `C++`
 - [Myflix](https://github.com/pastapojken/Myflix) - Self-hosted, super lightweight Netflix alternative. `MIT` `Shell`
 - [Odd Networks](http://oddnetworks.com) - Open source video management system (VMS) and API for collections and videos with supporting SDKs for Roku, Apple iOS/tvOS, Google Android, and Amazon FireTV. ([Source Code](https://github.com/oddnetworks/oddworks)) `MIT` `Nodejs`
 - [PeerTube](https://framagit.org/chocobozzz/PeerTube) - Decentralized video streaming platform using P2P (BitTorrent) directly in the web browser. `AGPL-3.0` `Nodejs`
 - [ReadyMedia](http://sourceforge.net/projects/minidlna/) - Simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients. `GPL-2.0` `C`
 - [Restreamer](https://datarhei.github.io/restreamer/) - Restreamer allows you to do h.264 real-time video streaming on your website without a streaming provider. ([Source Code](https://github.com/datarhei/restreamer)) `Apache-2.0` `Nodejs/Docker`
 - [Rygel](https://wiki.gnome.org/action/show/Projects/Rygel) - Rygel is a UPnP AV MediaServer that allows you to easily share audio, video, and pictures. Media player software may use Rygel to become a MediaRenderer that may be controlled remotely by a UPnP or DLNA Controller. `GPL-3.0` `C`
 - [Shinobi](https://moeiscool.github.io/Shinobi/) - Open Source CCTV software written in Node with both IP and local camera support. ([Source Code](https://github.com/moeiscool/Shinobi)) `GPL-2.0` `Nodejs`
 - [Streama](https://github.com/dularion/streama) - Self-hosted Netflix alternative. `MIT` `Java`
 - [üWave](http://u-wave.net/) `⚠` - üWave is a self-hosted collaborative listening platform. Users take turns playing media—songs, talks, gameplay videos, or anything else—from a variety of media sources like YouTube and SoundCloud. ([Demo](https://wlk.yt/), [Source Code](https://github.com/u-wave)) `MIT` `Nodejs`
 - [VideoLAN Client (VLC)](https://www.videolan.org/) - Cross-platform multimedia player client and server supporting most multimedia files as well as DVDs, Audio CDs, VCDs, and various streaming protocols. ([Source Code](https://github.com/videolan/vlc)) `Multiple` `C`
 - [Zoneminder](https://github.com/ZoneMinder/ZoneMinder) - Closed-circuit television (CCTV) software application which supports IP, USB and Analog cameras. `GPL-2.0` `PHP`
@ -865,6 +882,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [DomainMOD](https://domainmod.org) - Application to manage your domains and other internet assets in a central location. DomainMOD includes a Data Warehouse framework that allows you to import your WHM/cPanel web server data so that you can view, export, and report on your data. ([Demo](https://demo.domainmod.org), [Source Code](https://github.com/domainmod/domainmod)) `GPL-3.0` `PHP`
 - [EasyBook Project](http://easybook-project.org/) - Book publishing as easy as it should be. ([Source Code](https://github.com/javiereguiluz/easybook)) `MIT` `PHP`
 - [Flox](https://github.com/devfake/flox) `⚠` - Self hosted movie, TV series and anime watch list with a 3-point rating system. Uses The Movie Database backend for information. ([Demo](http://80.240.132.120/flox-demo/public/)) `MIT` `PHP`
 - [formspree](https://formspree.io/) `⚠` - Just send your form to our URL and we'll forward it to your email. No PHP, Javascript or sign up required. ([Demo](http://testformspree.com/), [Source Code](https://github.com/formspree/formspree)) `AGPL-3.0` `Python`
 - [GeneWeb](https://geneweb.tuxfamily.org/wiki/GeneWeb) - GeneWeb is an open source genealogy software written in OCaml. It comes with a Web interface and can be used off-line or as a Web service. ([Demo](https://demo.geneweb.tuxfamily.org/gw7/), [Source Code](https://github.com/geneweb/geneweb)) `GPL-2.0` `OCAML`
 - [How Secure Is My Password](https://github.com/howsecureismypassword/hsimp) - Rather than just saying a password is "weak" or "strong", How Secure is My Password? lets your users know how long it would take someone to crack their password. ([Demo](https://howsecureismypassword.net/)) `MIT` `Javascript`
 - [google-webfonts-helper](https://github.com/majodev/google-webfonts-helper) `⚠` - Hassle-Free Way to Self-Host Google Fonts. Get eot, ttf, svg, woff and woff2 files + CSS snippets. ([Demo](https://google-webfonts-helper.herokuapp.com/)) `MIT` `Nodejs`
@ -883,7 +901,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 - [Ulterius](https://ulterius.io) - Ulterius is an open-source remote desktop software with lots of awesome functions. ([Demo](https://ulterius.io/signup/), [Source Code](https://github.com/Ulterius/server)) `MPL-2.0` `C#`
 - [ViMbAdmin](http://www.vimbadmin.net/) - Provides a web based virtual mailbox administration system to allow mail administrators to easily manage domains, mailboxes and aliases. ([Demo](http://www.vimbadmin.net/demo/auth/login), [Source Code](https://github.com/opensolutions/ViMbAdmin)) `GPL-3.0` `PHP`
 - [visualCaptcha](http://visualcaptcha.net/) - Configurable captcha solution, focusing on accessibility and simplicity whilst maintaining security. ([Demo](http://demo.visualcaptcha.net/), [Source Code](https://github.com/emotionLoop/visualCaptcha)) `MIT` `PHP/Nodejs/Ruby/Python`
- [Web fonts repository](https://github.com/FinesseRus/web-fonts-repository) — A simple webfont hosting. Google Fonts alternative for your own fonts. `MIT` `PHP`
+- [Web fonts repository](https://github.com/Finesse/web-fonts-repository) — A simple webfont hosting. Google Fonts alternative for your own fonts. `MIT` `PHP`
 - [webtrees](https://www.webtrees.net) - Webtrees is the web's leading on-line collaborative genealogy application. ([Demo](https://dev.webtrees.net/demo-stable/index.php?ctype=gedcom&ged=demo), [Source Code](https://github.com/fisharebest/webtrees)) `GPL-3.0` `PHP`
 ## Money, Budgeting and Management
@ -1005,9 +1023,8 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
 - [Dj Diabetes](https://github.com/foxmask/dj-diabetes) - My Glucose Manager - follow your daily health. `BSD` `Python`
 - [Habitica](https://habitica.com/) - Habit tracker app which treats your goals like a Role Playing Game. Previously called HabitRPG. ([Source Code](https://github.com/HabitRPG/habitrpg)) `GPL-3.0/CC-BY-NC-SA-3.0/CC-BY-SA-3.0` `Nodejs`
 - [Homepage](https://github.com/thetomester13/homepage) - Simple, standalone, self-hosted PHP page that is your window to your server and the web. `MIT` `PHP`
 - [iDashboard-PHP](https://github.com/causefx/iDashboard-PHP) - HTPC Dashboard to load website services. `MIT` `PHP`
 - [Iotdashboard](http://iotdashboard.pythonanywhere.com/en/) - Fast Django server for IOT Devices. ([Source Code](https://github.com/electrocoder/iotdashboard)) `Apache-2.0` `JavaScript`
- [Phant](http://phant.io/) - Phant is a modular data logging tool for collecting data from the Internet of Things. ([Demo](https://data.sparkfun.com/), [Source Code](https://github.com/sparkfun/phant)) `GPL-3.0` `Nodejs`
+- [simple-dash](https://github.com/Swagielka/simple-dash) - A simple, fully responsive Dashboard to forward to the services of your choice! `MIT` `PHP`
 - [Thingsboard](https://thingsboard.io/) - Open-source IoT Platform - Device management, data collection, processing and visualization. ([Demo](https://demo.thingsboard.io/signup), [Source Code](https://github.com/thingsboard/thingsboard)) `Apache-2.0` `Java`
 - [Thingspeak](https://thingspeak.com/) - Open source “Internet of Things” application and API to store and retrieve data from things using HTTP. ([Demo](https://thingspeak.com/channels/public), [Source Code](https://github.com/iobridge/thingspeak)) `GPL-3.0` `Ruby`
 - [Tipboard](http://allegro.tech/tipboard/) - In-house, tasty, local dashboarding system. ([Source Code](https://github.com/allegro/tipboard)) `Apache-2.0` `Python`
@ -1081,6 +1098,7 @@ See https://github.com/n1trux/awesome-sysadmin#metric--metric-collection
 **[`^        back to top        ^`](#)**
 - [Ambar](https://ambar.cloud) - Document Search Engine (OCR, Store & Search) ([Demo](https://app.ambar.cloud/), [Source Code](https://github.com/RD17/ambar)) `MIT` `Nodejs/Python`  
 - [Gigablast](http://www.gigablast.com/) - open source search engine. ([Demo](http://www.gigablast.com/), [Source Code](https://github.com/gigablast/open-source-search-engine)) `Apache-2.0` `C++`
 - [Seeks](https://beniz.github.io/seeks/) - Web search proxy and collaborative distributed tool for websearch. ([Source Code](https://github.com/beniz/seeks)) `AGPL-3.0` `C++`
 - [Searx](https://asciimoo.github.io/searx/) - Privacy-respecting, hackable metasearch engine. ([Demo](https://searx.me/), [Source Code](https://github.com/asciimoo/searx)) `AGPL-3.0` `Python`
@ -1128,6 +1146,7 @@ See **[Ticketing](#ticketing)**
 ### IDE/Tools
 - [Babelfish](https://doc.bblf.sh) - Self-hosted server for source code parsing. It can parse any file, in any supported language, extract an Abstract Syntax Tree from it, and convert it to a Universal Abstract Syntax Tree which can enable further analysis and transformation. ([Source Code](https://github.com/bblfsh/)) `GPL-3.0` `Go`
 - [Codiad](http://codiad.com/) - Web-based IDE framework with a small footprint and minimal requirements. ([Source Code](https://github.com/Codiad/Codiad)) `MIT` `PHP`
 - [Eclipse Che](http://www.eclipse.org/che/) - Open source workspace server and cloud IDE. ([Source Code](https://github.com/eclipse/che)) `EPL-1.0` `Docker/Java`
 - [ICEcoder](https://icecoder.net/) - ICEcoder is a web IDE / browser based code editor, which allows you to develop websites directly within the web browser. ([Demo](http://demo.icecoder.net/ICEcoder/), [Source Code](https://github.com/mattpass/ICEcoder)) `MIT` `PHP`
@ -1158,9 +1177,9 @@ See **[Ticketing](#ticketing)**
 *[Serverless computing on Wikipedia](https://en.wikipedia.org/wiki/Serverless_computing)*
- [FX](https://github.com/metrue/fx) - fx is a tool to help you do Function as a Service with painless on your own servers `MIT` `Go`
+- [FX](https://github.com/metrue/fx) - fx is a tool to help you do Function as a Service with painless on your own servers. `MIT` `Go`
 - [IronFunctions](https://github.com/iron-io/functions) - the serverless microservices platform by [iron.io](https://www.iron.io/) `Apache-2.0` `Go`
- [OpenFaaS](https://www.openfaas.com/) - Serverless Functions Made Simple for Docker & Kubernetes ([Source Code](https://github.com/openfaas/faas)) `MIT` `Go`
+- [OpenFaaS](https://www.openfaas.com/) - Serverless Functions Made Simple for Docker & Kubernetes. ([Source Code](https://github.com/openfaas/faas)) `MIT` `Go`
 ### API Management
@ -1181,6 +1200,7 @@ See also [Static site generators](#static-site-generators)
 ### Localization
 - [Accent](https://www.accent.reviews/) - Open-source, self-hosted, developer-oriented translation tool. ([Source code](https://github.com/mirego/accent)) `BSD-3-Clause` `Elixir`
 - [Parrot](http://parrot-translate.github.io/parrot.github.io/) - Self-hosted Localization Management Platform built with Go and Angular 2. ([Source Code](https://github.com/parrot-translate/parrot)) `MIT` `Go`
 - [Pootle](http://pootle.translatehouse.org) - Online translation and localization tool. ([Source Code](https://github.com/translate/pootle)) `GPL-3.0` `Python`
 - [Weblate](https://weblate.org) - Web-based translation tool with tight version control integration. ([Demo](https://demo.weblate.org), [Source Code](https://github.com/WeblateOrg/weblate)) `GPL-3.0` `Python`
@ -1277,6 +1297,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 - [Blazekiss](http://projet.idleman.fr/blazekiss/) - BlazeKiss is a KISS-based wiki (Keep It Simple, Stupid) - simplicity and functionality comes before all. ([Source Code](https://github.com/ldleman/blazekiss)) `GPL-3.0` `PHP`
 - [BookStack](https://www.bookstackapp.com/) - BookStack is a simple, self-hosted, easy-to-use platform for organizing and storing information. It allows for documentation to be stored in a book like fashion. ([Demo](https://www.bookstackapp.com/#demo), [Source Code](https://github.com/ssddanbrown/BookStack)) `MIT` `PHP`
 - [Cowyo](https://github.com/schollz/cowyo/) - Cowyo is a feature-rich wiki for minimalists. ([Demo](https://cowyo.com)) `MIT` `Go`
 - [django-wiki](https://github.com/django-wiki/django-wiki) - Wiki system with complex functionality for simple integration and a superb interface. Store your knowledge with style: Use django models. ([Demo](https://demo.django.wiki/)) `GPL-3.0` `Python`
 - [Documize](https://documize.com) - Modern Docs + Wiki software with built-in workflow, single binary executable, just bring MySQL/Percona. ([Source Code](https://github.com/documize/community)) `AGPL-3.0` `Go`
 - [Dokuwiki](https://www.dokuwiki.org/DokuWiki) - Easy to use, lightweight, standards-compliant wiki engine with a simple syntax allowing reading the data outside the wiki. All data is stored in plain files, therefore no database is required. ([Source Code](https://github.com/splitbrain/dokuwiki)) `GPL-2.0` `PHP`
@ -1374,12 +1395,11 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 **[`^        back to top        ^`](#)**
 - [Awesome Selfhosted Chat](https://chat.awesome-selfhosted.com) - Rocket.chat instance setup for the awesome selfhosted community.
 - [Awesome Big Data](https://github.com/onurakpolat/awesome-bigdata) - Curated list of awesome big data frameworks, resources and other awesomeness.
 - [Awesome Sysadmin](https://github.com/n1trux/awesome-sysadmin) - Curated list of amazingly awesome open source sysadmin resources.
- [PRISM Break](https://prism-break.org/en/), [privacytools.io](https://www.privacytools.io/), [Alternative Internet](https://redecentralize.github.io/alternative-internet/), [Libre Projects](http://libreprojects.net/) - Lists of software aimed at privacy and decentralization (in some form).
+- Lists of software aimed at privacy and decentralization in some form: [PRISM Break](https://prism-break.org/en/), [privacytools.io](https://www.privacytools.io/), [Alternative Internet](https://redecentralize.github.io/alternative-internet/), [Libre Projects](http://libreprojects.net/)
 - Dynamic Domain Name services: [Afraid.org](https://freedns.afraid.org/domain/registry/), [Pagekite](https://pagekite.net/)
- Communities/forums: [/r/selfhosted](https://www.reddit.com/r/selfhosted), [IndieWeb](https://indieweb.org/), [Auto-Hébergement (FR)](http://www.auto-hebergement.fr/)
+- Communities/forums: [/r/selfhosted](https://www.reddit.com/r/selfhosted), [IndieWeb](https://indieweb.org/)
 --------------------
--- a/non-free.md
+++ b/non-free.md
@ -24,9 +24,6 @@
  * [Synereo](https://www.synereo.com/) - Decentralized network system based on blockchain that allows fast speed and great trust level. ([Source Code](https://github.com/synereo/synereo)) `Scala`  
 ## Document Archiving
 * [Ambar](https://ambar.cloud) - Self-Hosted Smart Document Archive (OCR, Store & Search). ([Source Code](https://github.com/RD17/ambar)) `Fair Source 1 v0.9` `Nodejs/Python`  
 ## Federated Identity/Authentication
  * [Auth0](https://auth0.com/docs/appliance): `⊘ Proprietary`. Identity made simple for developers. `NodeJS`
@ -111,6 +108,10 @@
  * [SupportPal](https://www.supportpal.com/) `⊘ Proprietary` - Powerful help desk software - easy, fast and intuitive. ([Demo](http://demo.supportpal.com/)) `PHP`
 ## Time Tracking
  * [Virtual TimeClock](https://www.redcort.com/timeclock) `⊘ Proprietary` - Powerful, easy-to-use time tracking software. ([Demo](https://www.redcort.com/timeclock/free-timeclock-software-trial))
 ## Remote Support
 * [ScreenConnect](https://www.screenconnect.com/) `⊘ Proprietary` - ScreenConnect offers lightning-fast remote support and remote access to connect instantly and solve problems faster.