diff --git a/.gitignore b/.gitignore index 27e57ba86..95a189484 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ callgrind.* *.sig *.signed +!/debian/mainnet/bootstrap.signed +!/debian/testnet/bootstrap.signed *.key shadow.data diff --git a/debian/lokinet-bin.install b/debian/lokinet-bin.install index a5169e778..859d1ffb9 100644 --- a/debian/lokinet-bin.install +++ b/debian/lokinet-bin.install @@ -1,3 +1,5 @@ /usr/bin/lokinet /usr/bin/lokinet-bootstrap /usr/bin/lokinet-vpn +debian/mainnet/bootstrap.signed /var/lib/lokinet +debian/testnet/bootstrap.signed /var/lib/lokinet/testnet diff --git a/debian/lokinet-router.postinst b/debian/lokinet-router.postinst index 88f409954..65f9c997e 100644 --- a/debian/lokinet-router.postinst +++ b/debian/lokinet-router.postinst @@ -13,16 +13,6 @@ if [ "$1" = configure ]; then chown _lokinet:_loki $d done - if ! [ -e /var/lib/lokinet/bootstrap.signed ]; then - /usr/bin/lokinet-bootstrap lokinet /var/lib/lokinet/bootstrap.signed - chown _lokinet:_loki /var/lib/lokinet/bootstrap.signed - fi - - if ! [ -e /var/lib/lokinet/testnet/bootstrap.signed ]; then - /usr/bin/lokinet-bootstrap testnet /var/lib/lokinet/testnet/bootstrap.signed - chown _lokinet:_loki /var/lib/lokinet/testnet/bootstrap.signed - fi - tmpdir=$(mktemp --tmpdir -d lokinet.XXXXXXXXXX) /usr/bin/lokinet -r -g $tmpdir/lokinet.ini perl -pi -e " diff --git a/debian/lokinet.postinst b/debian/lokinet.postinst index 7ffd194e1..16bedc84f 100644 --- a/debian/lokinet.postinst +++ b/debian/lokinet.postinst @@ -12,16 +12,6 @@ if [ "$1" = configure ]; then su -s /bin/sh _lokinet -c "test -O $tn_datadir && test -G $tn_datadir" || \ chown _lokinet:_loki $tn_datadir - if ! [ -e /var/lib/lokinet/bootstrap.signed ]; then - /usr/bin/lokinet-bootstrap lokinet /var/lib/lokinet/bootstrap.signed - chown _lokinet:_loki /var/lib/lokinet/bootstrap.signed - fi - - if ! [ -e /var/lib/lokinet/testnet/bootstrap.signed ]; then - /usr/bin/lokinet-bootstrap testnet /var/lib/lokinet/testnet/bootstrap.signed - chown _lokinet:_loki /var/lib/lokinet/testnet/bootstrap.signed - fi - tmpdir=$(mktemp --tmpdir -d lokinet.XXXXXXXXXX) /usr/bin/lokinet -g $tmpdir/lokinet.ini sed -i -e "s#$tmpdir#$datadir#" $tmpdir/lokinet.ini diff --git a/debian/mainnet/bootstrap.signed b/debian/mainnet/bootstrap.signed new file mode 100644 index 000000000..4dabc8e93 Binary files /dev/null and b/debian/mainnet/bootstrap.signed differ diff --git a/debian/source/include-binaries b/debian/source/include-binaries index 0f16ee8dd..01b2cbf07 100644 --- a/debian/source/include-binaries +++ b/debian/source/include-binaries @@ -1 +1,3 @@ debian/deb.loki.network.gpg +debian/mainnet/bootstrap.signed +debian/testnet/bootstrap.signed diff --git a/debian/testnet/bootstrap.signed b/debian/testnet/bootstrap.signed new file mode 100644 index 000000000..9ad107115 Binary files /dev/null and b/debian/testnet/bootstrap.signed differ