Merge branch 'master' of github.com:Lissy93/dashy

.github/AUTHORS.txt

@@ -12,6 +12,7 @@ Jemy <CHNEP> - 1 commits
 Jeremy <hauvi> - 1 commits
 Kieren <onnel> - 1 commits
 Leonardo <olma> - 1 commits
+PlusaN <61884717+PlusaN@users.noreply.github.com> - 1 commits
 Rune <jørnerå> - 1 commits
 Ryan <urne> - 1 commits
 Shreya <o> - 1 commits
@@ -49,12 +50,12 @@ snyk-bot <snyk-bot@users.noreply.github.com> - 18 commits
 aterox <church.kennetha@gmail.com> - 19 commits
 EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits
 Alicia <yke> - 28 commits
-repo-visualizer <repo-visualizer@users.noreply.github.com> - 36 commits
+repo-visualizer <repo-visualizer@users.noreply.github.com> - 37 commits
-snyk-bot <snyk-bot@snyk.io> - 40 commits
+snyk-bot <snyk-bot@snyk.io> - 43 commits
-Alicia <o> - 72 commits
+Alicia <o> - 74 commits
 Lissy93 <gh@d0h.co> - 78 commits
-liss-bot <liss-bot@d0h.co> - 83 commits
+liss-bot <liss-bot@d0h.co> - 85 commits
-Alicia <yke> - 110 commits
+Alicia <yke> - 112 commits
 Lissy93 <Lissy93@users.noreply.github.com> - 207 commits
-Alicia <yke> - 368 commits
+Alicia <yke> - 395 commits
 Alicia <yke> - 1488 commits

README.md

@@ -529,7 +529,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
     </td>
     <td align="center">
         <a href="https://github.com/emlazzarin">
-            <img src="https://avatars.githubusercontent.com/u/1141361?v=4" width="80;" alt="emlazzarin"/>
+            <img src="https://avatars.githubusercontent.com/u/1141361?u=714e3487a3f2e0df721b01a0133945f075d3ff68&v=4" width="80;" alt="emlazzarin"/>
             <br />
             <sub><b>Eddy Lazzarin</b></sub>
         </a>
@@ -572,7 +572,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
     </td>
     <td align="center">
         <a href="https://github.com/shadowking001">
-            <img src="https://avatars.githubusercontent.com/u/43928955?v=4" width="80;" alt="shadowking001"/>
+            <img src="https://avatars.githubusercontent.com/u/43928955?u=a00b44f22e5a82234d9b406ac048def1fbc16e31&v=4" width="80;" alt="shadowking001"/>
             <br />
             <sub><b>LawrenceP.</b></sub>
         </a>
@@ -584,6 +584,13 @@ Huge thanks to the sponsors helping to support Dashy's development!
             <sub><b>Kieren Connell</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Antiz96">
+            <img src="https://avatars.githubusercontent.com/u/53110319?v=4" width="80;" alt="Antiz96"/>
+            <br />
+            <sub><b>Robin Candau</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/ratty222">
             <img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
@@ -597,7 +604,8 @@ Huge thanks to the sponsors helping to support Dashy's development!
             <br />
             <sub><b>Undefined</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/jtfinley72">
             <img src="https://avatars.githubusercontent.com/u/96497997?v=4" width="80;" alt="jtfinley72"/>

docs/configuring.md

@@ -312,7 +312,7 @@ When updating the config through the JSON editor in the UI, you have two save op
 
 If you have authentication set up, then any user who is not an admin (with `type: admin`) will not be able to write changes to disk.
 
-You can also prevent changes fro any user being written to disk, using `preventWriteToDisk`. Or prevent any changes from being saved locally in browser storage, using `preventLocalSave`.
+You can also prevent changes from any user being written to disk, using `preventWriteToDisk`. Or prevent any changes from being saved locally in browser storage, using `preventLocalSave`.
 
 To disable all UI config features, set `disableConfiguration`.
 

docs/credits.md

@@ -13,7 +13,7 @@
     </td>
     <td align="center">
         <a href="https://github.com/emlazzarin">
-            <img src="https://avatars.githubusercontent.com/u/1141361?v=4" width="80;" alt="emlazzarin"/>
+            <img src="https://avatars.githubusercontent.com/u/1141361?u=714e3487a3f2e0df721b01a0133945f075d3ff68&v=4" width="80;" alt="emlazzarin"/>
             <br />
             <sub><b>Eddy Lazzarin</b></sub>
         </a>
@@ -56,7 +56,7 @@
     </td>
     <td align="center">
         <a href="https://github.com/shadowking001">
-            <img src="https://avatars.githubusercontent.com/u/43928955?v=4" width="80;" alt="shadowking001"/>
+            <img src="https://avatars.githubusercontent.com/u/43928955?u=a00b44f22e5a82234d9b406ac048def1fbc16e31&v=4" width="80;" alt="shadowking001"/>
             <br />
             <sub><b>LawrenceP.</b></sub>
         </a>
@@ -68,6 +68,13 @@
             <sub><b>Kieren Connell</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Antiz96">
+            <img src="https://avatars.githubusercontent.com/u/53110319?v=4" width="80;" alt="Antiz96"/>
+            <br />
+            <sub><b>Robin Candau</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/ratty222">
             <img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
@@ -81,7 +88,8 @@
             <br />
             <sub><b>Undefined</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/jtfinley72">
             <img src="https://avatars.githubusercontent.com/u/96497997?v=4" width="80;" alt="jtfinley72"/>
@@ -171,7 +179,7 @@
         <a href="https://github.com/stanly0726">
             <img src="https://avatars.githubusercontent.com/u/37040069?v=4" width="80;" alt="stanly0726"/>
             <br />
-            <sub><b>stanly0726</b></sub>
+            <sub><b>Stanly0726</b></sub>
         </a>
     </td>
     <td align="center">

server.js

@@ -38,6 +38,9 @@ const isDocker = !!process.env.IS_DOCKER;
 /* Checks env var for port. If undefined, will use Port 80 for Docker, or 4000 for metal */
 const port = process.env.PORT || (isDocker ? 80 : 4000);
 
+/* Checks env var for host. If undefined, will use 0.0.0.0 */
+const host = process.env.HOST || '0.0.0.0';
+
 /* Attempts to get the users local IP, used as part of welcome message */
 const getLocalIp = () => {
   const dnsLookup = util.promisify(dns.lookup);
@@ -48,7 +51,7 @@ const getLocalIp = () => {
 const printWelcomeMessage = () => {
   try {
     getLocalIp().then(({ address }) => {
-      const ip = address || 'localhost';
+      const ip = process.env.HOST || address || 'localhost';
       console.log(printMessage(ip, port, isDocker)); // eslint-disable-line no-console
     });
   } catch (e) {
@@ -122,7 +125,7 @@ const app = express()
 
 /* Create HTTP server from app on port, and print welcome message */
 http.createServer(app)
-  .listen(port, () => {
+  .listen(port, host, () => {
     printWelcomeMessage();
   })
   .on('error', (err) => {