Remove bootstrap.signed from generated default configs

We now how the bootstrap in the binary itself.

This doesn't remove the installed bootstrap files, though, for backwards
compat: existing configs may be referencing the system path.
ubuntu/kinetic
Jason Rhinelander 2 years ago
parent 2b0392b736
commit c9a222f48a
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262

@ -1,6 +1,5 @@
[Unit]
Description=LokiNET: Anonymous Network layer thingydoo, router
AssertFileNotEmpty=/var/lib/lokinet/bootstrap.signed
Wants=network-online.target
After=network-online.target

@ -1,6 +1,5 @@
[Unit]
Description=LokiNET: Anonymous Network layer thingydoo, router (testnet)
AssertFileNotEmpty=/var/lib/lokinet/testnet/bootstrap.signed
Wants=network-online.target
After=network-online.target

@ -17,9 +17,6 @@ if [ "$1" = configure ]; then
/usr/bin/lokinet -r -g $tmpdir/lokinet.ini
perl -pi -e "
s#$tmpdir#$datadir#;
if (/^\[bootstrap/ ... /^\[/) {
s{^#?add-node=.*}{add-node=/var/lib/lokinet/bootstrap.signed};
}
if (/^\[lokid/ ... /^\[/) {
s{^#?enabled=.*}{enabled=1};
s{^#?rpc=.*}{rpc=ipc:///var/lib/loki/lokid.sock};
@ -33,9 +30,6 @@ if [ "$1" = configure ]; then
/usr/bin/lokinet -r -g $tmpdir/lokinet.ini
perl -pi -e "
s#$tmpdir#$tn_datadir#;
if (/^\[bootstrap/ ... /^\[/) {
s{^#?add-node=.*}{add-node=/var/lib/lokinet/testnet/bootstrap.signed};
}
if (/^\[router/ ... /^\[/) {
s{^#?netid=.*}{netid=gamma};
}

@ -1,6 +1,5 @@
[Unit]
Description=LokiNET: Anonymous Network layer thingydoo, client (testnet)
AssertFileNotEmpty=/var/lib/lokinet/testnet/bootstrap.signed
Wants=network-online.target
After=network-online.target

@ -1,6 +1,5 @@
[Unit]
Description=LokiNET: Anonymous Network layer thingydoo, client
AssertFileNotEmpty=/var/lib/lokinet/bootstrap.signed
Wants=network-online.target
After=network-online.target

@ -1,3 +1 @@
debian/deb.loki.network.gpg
debian/mainnet/bootstrap.signed
debian/testnet/bootstrap.signed

Loading…
Cancel
Save