Skip to content

Commit e283682

Browse files
committed
bootstrap only if configured
1 parent afdfd64 commit e283682

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,14 @@ Keep in mind that:
6363
6464
### Deployment
6565

66-
Create or update a node in two or three steps:
66+
Create a node in two or three steps (or update in one). The initial reboot, as well as those after upgrading, may take a while as everything is set up, but the subsequent ones will be much faster. For example, the SaaH peer will be created on a HaaS if it doesn't exist. This means that you should set a Hub or HaaS up first, so SaaH and Spoke peer configurations can be generated. Drop those in their `wireguard/config/wg_confs` directories before rebooting. This [AllowedIPs Calculator](https://www.procustodibus.com/blog/2021/03/wireguard-allowedips-calculator) is pretty nifty, if you need it.
6767

68-
1. Install the package by either:
68+
1. Install or update the package by either:
6969
- pasting the one-liner or block below;
7070
- downloading it from [Releases](https://github.com/ipitio/closure/releases); or
71-
- copying this repo to `/opt/closure`, then ensuring the executable `rc.local` is moved to `/etc`.
71+
- copying this repo to `/opt/closure`.
72+
73+
If you're installing on top of an existing configuration with one of the first two options, or updating by running `sudo apt upgrade -y closure`, `rc.local` will be copied for you; skip step 2 and reboot after this step.
7274

7375
```{bash}
7476
curl -sSLNZ https://ipitio.github.io/closure/i | sudo bash
@@ -86,10 +88,8 @@ sudo apt-get update
8688
sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq closure
8789
```
8890

89-
2. Edit the files above and reboot. Reboot after upgrades, too. This boot, as well as those after upgrading, may take a while as everything is set up, but the subsequent ones will be much faster. The SaaH peer will be created on a HaaS if it doesn't exist.
90-
3. On a Hub or HaaS, add Spokes you didn't define in `compose.yml` by running `add.sh` as described below.
91-
92-
Set a Hub or HaaS up first, so SaaH and Spoke peer configurations can be generated, then drop those in their `wireguard/config/wg_confs` directories before rebooting them. This [AllowedIPs Calculator](https://www.procustodibus.com/blog/2021/03/wireguard-allowedips-calculator) is pretty nifty, if you need it.
91+
2. Edit the files above, copy `rc.local` to `/etc`, and reboot.
92+
3. On a Hub or HaaS, add Spokes you didn't define yet by running `add.sh` as described below.
9393

9494
> [!NOTE]
9595
> Any arguments passed to `kickstart.sh` are passed to `start.sh`, which can add or edit wifi networks -- useful on a Raspberry Pi Zero (2) W! See the top of `start.sh` for the arguments it takes.

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
44
Standards-Version: 3.9.2
55

66
Package: closure
7-
Version: 1.6.25
7+
Version: 1.6.26
88
Maintainer: ipitio <21136719+ipitio@users.noreply.github.com>
99
Depends: curl, flatpak, gpg, hostapd, isc-dhcp-server, iw, macchanger, netplan.io, network-manager, net-tools, qrencode, rfkill, wireguard, wireless-tools, wget
1010
Recommends: containerd.io, docker-ce, docker-ce-cli, docker-buildx-plugin, docker-compose-plugin

debian/postinst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# shellcheck disable=SC1003
33

44
pushd /opt/closure || exit 1
5-
cp rc.local /etc/rc.local rc.local.bak
6-
chmod +x /etc/rc.local
5+
[ ! -f env.sh ] || cp rc.local /etc/rc.local
76
[ ! -f /opt/closure/installed ] || rm -rf /opt/closure/installed
87
popd || exit 1

0 commit comments

Comments
 (0)