From 0ae8ddf00b5bb3a8e46bc141bf00893f0863c22c Mon Sep 17 00:00:00 2001
From: Key Networks <34238649+key-networks@users.noreply.github.com>
Date: Wed, 13 Dec 2017 23:50:17 +0800
Subject: [PATCH] Added etc/passwd to .gitignore to avoid over-writing on
 updates

---
 .gitignore                     |  1 +
 README.md                      | 12 +++++++++---
 etc/{passwd => default.passwd} |  0
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename etc/{passwd => default.passwd} (100%)

diff --git a/.gitignore b/.gitignore
index ef66e47..532fa27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+etc/passwd
 etc/storage/
 node_modules/
 *.swp
diff --git a/README.md b/README.md
index c738411..2ea691a 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,13 @@ Where:
 
 Note that you need to log out and in again to apply the new group membership.
 
-##### 4. Start the app manually:
+##### 4. Copy the default passwd file
+To prevent git from over-writing your password file every time you pull updates from the repository, the etc/passwd file has been added to .gitignore.  So you need to copy the default file after the first time you do a git clone.  All these things ideally need to be done with a package installer script:
+```shell
+cp -v etc/default.passwd etc/passwd
+```
+
+##### 5. Start the app manually:
 ```shell
 npm start
 ```
@@ -52,14 +58,14 @@ PORT=3456 npm start
 
 To start the app automatically, something like [PM2](http://pm2.keymetrics.io) can be used.
 
-##### 5. Test access on http://localhost:3000
+##### 6. Test access on http://localhost:3000
   If the machine has a GUI and GUI web browser, then use it to access the app, otherwise use a CLI web browser like Lynx or curl:
 ```shell
 curl http://localhost:3000
 ```
 You should see the front page of the app (or the raw HTML with curl).
 
-##### 6. Remote access:
+##### 7. Remote access:
 For security reasons (until this app is battle-hardened and has been scrutinized by the ZT community), it currently listens only on the looback interface.  It can be reverse proxied by something like Nginx, but it would be best to access over an SSH tunnel at this stage.
 
 ###### SSH tunnel from Linux / Unix / macOS client
diff --git a/etc/passwd b/etc/default.passwd
similarity index 100%
rename from etc/passwd
rename to etc/default.passwd