From 2a8930ce0056956bbc3ba9dd21499175bebb4b48 Mon Sep 17 00:00:00 2001
From: Pranav Jerry <libreinator@disroot.org>
Date: Fri, 10 Sep 2021 11:42:18 +0530
Subject: [PATCH] remove ipfs url from README.md

I don't use IPFS anymore. If anyone if willing to maintain a copy of
this repo on ipfs, send me an email.

Small change in CHANGELOG, and edited comments in systemd service.
And added a docstring to setup.py so the editor won't complain of
missing docstring anymore.
---
 CHANGELOG.md          | 4 ++--
 Makefile              | 2 +-
 README.md             | 6 ------
 naxalnet.conf.example | 1 +
 naxalnet.service      | 7 ++++---
 setup.py              | 4 +++-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03bbce2..a52bcbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # Changelog
 
-## [Unreleased][] - 2021-09-07
+## [Unreleased][] - 2021-09-09
 
 - naxalnet is now a daemon! naxalnet will reconfigure the WiFi network
   every time a WiFi adapter is plugged in or removed
 - **Logging**: logs to systemd journal when run from systemd, stderr
   otherwise
-- New dependency `python3-systemd`
+- New dependency `python-systemd`
 - Fixed dependency order in systemd service
 - Added `--verbose` argument
 
diff --git a/Makefile b/Makefile
index 6b53112..31a5e20 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ install: build
 uninstall:
 	$(PIP) uninstall -y naxalnet
 	rm -rf /usr/share/naxalnet /usr/lib/systemd/system/naxalnet.service
-	@-test -d /etc/naxalnet && echo "The directory /etc/naxalnet was not removed." && \
+	@echo "The directory /etc/naxalnet was not removed." && \
 	echo "Do 'sudo make purge' to remove it."
 
 # remove config files, like apt purge
diff --git a/README.md b/README.md
index d947b2d..862e999 100644
--- a/README.md
+++ b/README.md
@@ -116,12 +116,6 @@ git clone https://git.disroot.org/pranav/naxalnet.git
 cd naxalnet
 ```
 
-Or, if you have an [IPFS client][ipfs] running, try this instead:
-
-```sh
-git clone http://k51qzi5uqu5dlye74be0n9iihwk6sm54vexo7bf7pdr4w811y6mmrcp25djozv.ipns.localhost:8080/naxalnet.git
-```
-
 Now, build and install naxalnet:
 
 ```sh
diff --git a/naxalnet.conf.example b/naxalnet.conf.example
index f6f9877..b74d660 100644
--- a/naxalnet.conf.example
+++ b/naxalnet.conf.example
@@ -18,5 +18,6 @@ name = NxMesh
 [ap]
 # An AP is started if your machine has more than one WiFi adapter.
 ssid = MeshWiFi
+# Note the spelling. It's passwd, not password.
 passwd = naxalnet256
 
diff --git a/naxalnet.service b/naxalnet.service
index 624f8c3..94702ed 100644
--- a/naxalnet.service
+++ b/naxalnet.service
@@ -22,11 +22,12 @@ NotifyAccess=all
 Restart=on-failure
 RestartSec=2sec
 ExecStart=/usr/bin/naxalnet --systemd
-# Reload systemd-networkd after naxalnet exits
+# Reload systemd-networkd after naxalnet signals it is ready
 ExecStartPost=/usr/bin/networkctl reload
-# Delete all files starting with mesh.* in /run/systemd/network
+# When naxalnet exits, delete all files starting
+# with mesh.* in /run/systemd/network
 ExecStopPost=/usr/bin/find /run/systemd/network -type f -delete -name "mesh.*"
-# Delete the interfaces created...
+# Then delete the two interfaces created...
 ExecStopPost=/usr/bin/networkctl delete bridge0 bat0
 # ... and reload the configuration files.
 ExecStopPost=/usr/bin/networkctl reload
diff --git a/setup.py b/setup.py
index 229b2eb..1bb1a39 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
-
+"""
+See setup.py --help for usage
+"""
 from setuptools import setup
 
 setup()