diff --git a/.gitignore b/.gitignore index a785f948..8a5f70d0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ admin cln-notes.md .idea/ alts/bitcoind -jitsi/config/* \ No newline at end of file +jitsi/config/* +.vscode \ No newline at end of file diff --git a/README.md b/README.md index 2358b2cd..64603275 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,19 @@ Clear the existing configs, so you can start fresh: `./clearall.sh` +### aperture enabled paywall + +The sphinx-stack docker compose file uses profiles to opt-in to particular services. +To run with an aperture-enabled paywall, start the stack with the +following command: + +```shell +docker compose -f docker-compose.yml --profile aperture --project-directory . up -d +``` + +This will use the configs set in `/aperture/aperture.yaml`. +To update the timeout and other paywall related configs, edit that file. + ### developing/contributing to Sphinx - Run one of the sphinx clients on your local computer, and enter the `exported_keys` that you can find in `/relay/NODES.json` (make sure to copy the trailing `=` equal signs if there are any!) diff --git a/alts/lsat.yml b/alts/lsat.yml deleted file mode 100644 index 5ad116ff..00000000 --- a/alts/lsat.yml +++ /dev/null @@ -1,35 +0,0 @@ -version: "3" - -services: - etcd: - image: "quay.io/coreos/etcd" - container_name: etcd.sphinx - environment: - - ETCD_ADVERTISE_CLIENT_URLS=http://etcd.sphinx:2379 - - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379 - command: "etcd -name etcd-meme-aperture" - - aperture: - # image: "lightninglabs/aperture:v0.1.12-beta" - image: "bucko/aperture:timeout" - container_name: aperture.sphinx - ports: - # for now we will have aperture run on the default meme port - # so that it's easier to use this as a drop in replacement for any existing setups - - 5555:8081 - volumes: - - ./aperture:/aperture - # using alice's lnd node as the backend for aperture - - ./lnd/alice/.lnd:/lnd - # want to restart on failure b/c the lightning node needs to be - # fully operational so that aperture can connect to it and successfully start - restart: on-failure - depends_on: - - etcd - - alice-lnd - entrypoint: ["aperture", "--configfile=/aperture/aperture.yaml"] - -networks: - default: - name: sphinx-stack - \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6bc3b009..6261e467 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -111,7 +111,7 @@ services: - 1883:1883 meme: - image: sphinxlightning/sphinx-meme:latest + image: bucko/sphinx-meme:latest container_name: meme.sphinx restart: on-failure depends_on: @@ -239,7 +239,7 @@ services: # image: "lightninglabs/aperture:v0.1.12-beta" # hopefully this is a temporary replacement to use the new aperture # support for a timeout caveat - image: "bucko/aperture:timeout" + image: "bucko/aperture:timeoutv2" container_name: aperture.sphinx profiles: - aperture