Browse Source

Revert "Revert major changes for LND security patch (#1014)" (#1020)

This reverts commit 2d8cce1bcb.
pihole-2021.10
Luke Childs 3 years ago
committed by GitHub
parent
commit
c653741b5e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      apps/photoprism/docker-compose.yml
  2. 6
      apps/registry.json
  3. 2
      apps/specter-desktop/docker-compose.yml
  4. 4
      docker-compose.yml
  5. 1
      scripts/configure
  6. 7
      scripts/update/01-run.sh
  7. 3
      templates/bitcoin-sample.conf
  8. 3
      templates/electrs-sample.toml

3
apps/photoprism/docker-compose.yml

@ -2,8 +2,7 @@ version: "3.7"
services: services:
web: web:
# TODO: Update to release tag when photoprism support multiarch images image: photoprism/photoprism:20210925@sha256:238e6955804d82097d08f0e4318835721f46bd844f9065a38aa7d112ab72906e
image: photoprism/photoprism:preview@sha256:7fd6df5b78270d01299c1ce7dd8d4dc4de76540323a7c84f13e39cd48b12eac5
user: "1000:1000" user: "1000:1000"
restart: on-failure restart: on-failure
stop_grace_period: "1m" stop_grace_period: "1m"

6
apps/registry.json

@ -25,7 +25,7 @@
"id": "photoprism", "id": "photoprism",
"category": "Files", "category": "Files",
"name": "PhotoPrism", "name": "PhotoPrism",
"version": "210523-b1856b9d", "version": "20210925",
"tagline": "Self-host your photo and video library", "tagline": "Self-host your photo and video library",
"description": "PhotoPrism® is a privately hosted app for browsing, organizing, and sharing your photo collection. It makes use of the latest technologies to tag and find pictures automatically without getting in your way. Say goodbye to solutions that force you to upload your visual memories to the cloud!\n\n- Our intuitive user interface makes browsing and organizing your photo collection as easy as it should be — whether it’s on a phone, tablet, or desktop computer.\n\n- Index everything without worrying about duplicates or RAW to JPEG conversion.\n\n- Automatic image classification based on Google TensorFlow. In addition, our indexer detects colors, chroma, luminance, quality, panoramic projection, location type, and many other properties.\n\n- Includes four high-resolution world maps to see where you've been, and for rediscovering long-forgotten shots.\n\n- WebDAV clients, like Microsoft’s Windows Explorer or Apple's Finder, may connect directly to PhotoPrism so that you to can open, edit, and delete files from your computer or phone as if they were local. You may easily sync your pictures with PhotoSync as well.\n\n- Because PhotoPrism is built as a progressive web app, it provides a native app-like experience, and you may install it on your home screen. There's also a community-maintained native app in development.", "description": "PhotoPrism® is a privately hosted app for browsing, organizing, and sharing your photo collection. It makes use of the latest technologies to tag and find pictures automatically without getting in your way. Say goodbye to solutions that force you to upload your visual memories to the cloud!\n\n- Our intuitive user interface makes browsing and organizing your photo collection as easy as it should be — whether it’s on a phone, tablet, or desktop computer.\n\n- Index everything without worrying about duplicates or RAW to JPEG conversion.\n\n- Automatic image classification based on Google TensorFlow. In addition, our indexer detects colors, chroma, luminance, quality, panoramic projection, location type, and many other properties.\n\n- Includes four high-resolution world maps to see where you've been, and for rediscovering long-forgotten shots.\n\n- WebDAV clients, like Microsoft’s Windows Explorer or Apple's Finder, may connect directly to PhotoPrism so that you to can open, edit, and delete files from your computer or phone as if they were local. You may easily sync your pictures with PhotoSync as well.\n\n- Because PhotoPrism is built as a progressive web app, it provides a native app-like experience, and you may install it on your home screen. There's also a community-maintained native app in development.",
"developer": "PhotoPrism", "developer": "PhotoPrism",
@ -294,7 +294,7 @@
"id": "specter-desktop", "id": "specter-desktop",
"category": "Wallets", "category": "Wallets",
"name": "Specter Desktop", "name": "Specter Desktop",
"version": "1.5.1", "version": "1.6.0",
"tagline": "Multisig with hardware wallets made easy", "tagline": "Multisig with hardware wallets made easy",
"description": "Specter Desktop connects to the Bitcoin Core running on your Umbrel and functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets. At the moment Specter Desktop is working with all major hardware wallets including:\n\n- Trezor\n- Ledger\n- KeepKey\n- BitBox02\n- ColdCard (optionally airgapped, using an SD card)\n- Electrum (optionally airgapped, if running Electrum on an airgapped computer/phone)\n- Specter DIY (optionally airgapped, using QR codes)\n- Cobo (airgapped, using QR codes)\n\nSpecter Desktop also supports using the Bitcoin Core on your Umbrel as a hot wallet, by importing or generating a random BIP39 mnemonic, but this feature is experimental and we do not recommend using it at this stage. We plan to add support for other hardware wallets as they come up.", "description": "Specter Desktop connects to the Bitcoin Core running on your Umbrel and functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets. At the moment Specter Desktop is working with all major hardware wallets including:\n\n- Trezor\n- Ledger\n- KeepKey\n- BitBox02\n- ColdCard (optionally airgapped, using an SD card)\n- Electrum (optionally airgapped, if running Electrum on an airgapped computer/phone)\n- Specter DIY (optionally airgapped, using QR codes)\n- Cobo (airgapped, using QR codes)\n\nSpecter Desktop also supports using the Bitcoin Core on your Umbrel as a hot wallet, by importing or generating a random BIP39 mnemonic, but this feature is experimental and we do not recommend using it at this stage. We plan to add support for other hardware wallets as they come up.",
"developer": "Crypto Advance", "developer": "Crypto Advance",
@ -435,7 +435,7 @@
"name": "BTCPay Server", "name": "BTCPay Server",
"version": "1.2.3", "version": "1.2.3",
"tagline": "Accept Bitcoin payments with 0 fees & no 3rd party", "tagline": "Accept Bitcoin payments with 0 fees & no 3rd party",
"description": "BTCPay Server is a payment processor that allows you to receive payments in Bitcoin (and altcoins) directly, with no fees, transaction cost or a middleman. It is a non-custodial invoicing system which eliminates the involvement of a third-party.\n\nPayments with BTCPay Server go directly to your wallet, which increases the privacy and security. Your private keys are never uploaded to your Umbrel. There is no address re-use, since each invoice generates a new address deriving from your xpubkey.\n\nYou can not only to attach an unlimited number of stores and use the Lightning Network but also become a payment processor for others. Thanks to the apps built on top of it, you can use BTCPay to receive donations, start a crowdfunding campaign or have an in-store Point of Sale.", "description": "BTCPay Server is a payment processor that allows you to receive payments in Bitcoin (and altcoins) directly, with no fees, transaction cost or a middleman. It is a non-custodial invoicing system which eliminates the involvement of a third-party.\n\nPayments with BTCPay Server go directly to your wallet, which increases the privacy and security. Your private keys are never uploaded to your Umbrel. There is no address re-use, since each invoice generates a new address deriving from your xpubkey.\n\nYou can not only to attach an unlimited number of stores and use the Lightning Network but also become a payment processor for others. Thanks to the apps built on top of it, you can use BTCPay to receive donations, start a crowdfunding campaign or have an in-store Point of Sale.\n\nPlease note: Due to your BTCPay instance running on your local network connecting remote applications, such as Shopify or WordPress for example, will fail to connect.",
"developer": "BTCPay Server Foundation", "developer": "BTCPay Server Foundation",
"website": "https://btcpayserver.org", "website": "https://btcpayserver.org",
"dependencies": [ "dependencies": [

2
apps/specter-desktop/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
web: web:
image: lncm/specter-desktop:v1.5.1@sha256:fcfd2d5b5808c48717af7830b6da92606fbd7f5edcdd62b5766a0cb2f08f2ffe image: lncm/specter-desktop:v1.6.0@sha256:d641f3f81f2450e4f36803b39dc061a999f48eed8a8c4a1de4110391115938b0
stop_signal: SIGINT stop_signal: SIGINT
restart: on-failure restart: on-failure
stop_grace_period: 1m stop_grace_period: 1m

4
docker-compose.yml

@ -59,7 +59,7 @@ services:
ipv4_address: $NGINX_IP ipv4_address: $NGINX_IP
bitcoin: bitcoin:
container_name: bitcoin container_name: bitcoin
image: lncm/bitcoind:v0.21.1@sha256:5bedb46d698de16c59e9e43d31485d0d82239bd437d62ac7cf47ebb633214f37 image: lncm/bitcoind:v22.0@sha256:37a1adb29b3abc9f972f0d981f45e41e5fca2e22816a023faa9fdc0084aa4507
depends_on: [ tor, manager, nginx ] depends_on: [ tor, manager, nginx ]
volumes: volumes:
- ${PWD}/bitcoin:/data/.bitcoin - ${PWD}/bitcoin:/data/.bitcoin
@ -195,7 +195,7 @@ services:
ipv4_address: $NEUTRINO_SWITCHER_IP ipv4_address: $NEUTRINO_SWITCHER_IP
electrs: electrs:
container_name: electrs container_name: electrs
image: getumbrel/electrs:v0.8.11@sha256:71f3cb021f113fbeaf2312d37998c1dc99ff2c7a399d29c9e540b16e62c3696c image: getumbrel/electrs:v0.9.0@sha256:e52c137ec59b44d76695722f03a5fc021c9b02c2e40c324b4bb6094b358561e8
volumes: volumes:
- ${PWD}/bitcoin:/data/.bitcoin:ro - ${PWD}/bitcoin:/data/.bitcoin:ro
- ${PWD}/electrs:/data - ${PWD}/electrs:/data

1
scripts/configure

@ -322,6 +322,7 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
sed -i "s/<middleware-ip>/${MIDDLEWARE_IP}/g" "${template}" sed -i "s/<middleware-ip>/${MIDDLEWARE_IP}/g" "${template}"
sed -i "s/<neutrino-switcher-ip>/${NEUTRINO_SWITCHER_IP}/g" "${template}" sed -i "s/<neutrino-switcher-ip>/${NEUTRINO_SWITCHER_IP}/g" "${template}"
sed -i "s/<bitcoin-ip>/${BITCOIN_IP}/g" "${template}" sed -i "s/<bitcoin-ip>/${BITCOIN_IP}/g" "${template}"
sed -i "s/<bitcoin-p2p-port>/${BITCOIN_P2P_PORT}/g" "${template}"
sed -i "s/<lnd-ip>/${LND_IP}/g" "${template}" sed -i "s/<lnd-ip>/${LND_IP}/g" "${template}"
sed -i "s/<lnd-grpc-port>/${LND_GRPC_PORT}/g" "${template}" sed -i "s/<lnd-grpc-port>/${LND_GRPC_PORT}/g" "${template}"
sed -i "s/<lnd-rest-port>/${LND_REST_PORT}/g" "${template}" sed -i "s/<lnd-rest-port>/${LND_REST_PORT}/g" "${template}"

7
scripts/update/01-run.sh

@ -195,6 +195,13 @@ rsync --archive \
"$UMBREL_ROOT"/.umbrel-"$RELEASE"/ \ "$UMBREL_ROOT"/.umbrel-"$RELEASE"/ \
"$UMBREL_ROOT"/ "$UMBREL_ROOT"/
# Remove legacy electrs dir
legacy_electrs_dir="${UMBREL_ROOT}/electrs/db/mainnet"
if [[ -d "${legacy_electrs_dir}" ]]; then
echo "Found legacy electrs dir, removing it..."
rm --recursive --force "${legacy_electrs_dir}"
fi
# Handle updating static assets for samourai-server app # Handle updating static assets for samourai-server app
samourai_app_dir="${UMBREL_ROOT}/apps/samourai-server/nginx" samourai_app_dir="${UMBREL_ROOT}/apps/samourai-server/nginx"
samourai_data_dir="${UMBREL_ROOT}/app-data/samourai-server/nginx" samourai_data_dir="${UMBREL_ROOT}/app-data/samourai-server/nginx"

3
templates/bitcoin-sample.conf

@ -32,3 +32,6 @@ blockfilterindex=1
# SPV # SPV
peerbloomfilters=1 peerbloomfilters=1
peerblockfilters=1 peerblockfilters=1
# Compatibility
deprecatedrpc=addresses # https://github.com/mempool/mempool/issues/778#issuecomment-919194258

3
templates/electrs-sample.toml

@ -2,9 +2,10 @@
# modifications you make can break the functionality of your umbrel. These files # modifications you make can break the functionality of your umbrel. These files
# are automatically reset with every Umbrel update. # are automatically reset with every Umbrel update.
verbose = 4 verbose = 2
network = "bitcoin" network = "bitcoin"
db_dir = "/data/db" db_dir = "/data/db"
daemon_rpc_addr = "<bitcoin-ip>:<port>" daemon_rpc_addr = "<bitcoin-ip>:<port>"
daemon_p2p_addr = "<bitcoin-ip>:<bitcoin-p2p-port>"
electrum_rpc_addr = "0.0.0.0:<electrum-port>" electrum_rpc_addr = "0.0.0.0:<electrum-port>"
server_banner = "Umbrel v<version>" server_banner = "Umbrel v<version>"

Loading…
Cancel
Save