From cdf8160093092b41a88a868c1732acccd732ee7b Mon Sep 17 00:00:00 2001 From: maebeam Date: Thu, 9 Dec 2021 12:27:01 -0500 Subject: [PATCH 1/2] Remove duplicate caddyfile --- Caddyfile.dev | 53 --------------------------------------------------- README.md | 8 +++----- dev.env | 14 +++++++------- 3 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 Caddyfile.dev diff --git a/Caddyfile.dev b/Caddyfile.dev deleted file mode 100644 index 1aa505d..0000000 --- a/Caddyfile.dev +++ /dev/null @@ -1,53 +0,0 @@ -{ - admin off - auto_https off -} - -:8080 { - file_server - try_files {path} index.html - - header Access-Control-Allow-Methods "GET, PUT, POST, DELETE, OPTIONS" - header Access-Control-Allow-Origin "*" - header Content-Security-Policy " - default-src 'self'; - connect-src 'self' - api.bitclout.com bitclout.com:* - bithunt.bitclout.com pulse.bitclout.com - api.bitpop.dev - deso.run:* api.deso.run:* - localhost:* - explorer.bitclout.com:* - https://api.blockchain.com/ticker - https://api.blockchain.com/mempool/fees - https://ka-f.fontawesome.com/ - bitcoinfees.earn.com - api.blockcypher.com - amp.bitclout.com - api.bitclout.green api.bitclout.blue - api.bitclout.navy - api.testwyre.com - api.sendwyre.com - https://videodelivery.net - https://upload.videodelivery.net; - script-src 'self' https://cdn.jsdelivr.net/npm/sweetalert2@10 - https://kit.fontawesome.com/070ca4195b.js https://ka-f.fontawesome.com/; - style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; - img-src 'self' data: i.imgur.com images.deso.org images.bitclout.com quickchart.io arweave.net *.arweave.net cloudflare-ipfs.com; - font-src 'self' https://fonts.googleapis.com - https://fonts.gstatic.com https://ka-f.fontawesome.com; - frame-src 'self' localhost:* - identity.bitclout.com identity.bitclout.blue identity.bitclout.green - identity.deso.org identity.deso.blue identity.deso.green - https://www.youtube.com - https://player.vimeo.com - https://www.tiktok.com - https://giphy.com - https://open.spotify.com - https://w.soundcloud.com - https://player.twitch.com - https://clips.twitch.com - pay.testwyre.com - pay.sendwyre.com - https://iframe.videodelivery.net;" -} diff --git a/README.md b/README.md index 59fce7c..b6ec951 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,11 @@ data in real time! Below are some tips on how take full advantage of your node. * Whitelist some posts and verify that they show up on the global feed. * Deploy your node on any cloud provider with a static IP to make it accessible to anyone on the internet. - - If you do this, you must point *two* domains at your node. - domain.com *and* api.domain.com. - If you do this, you must replace deso.run with your domain in nginx.dev so that your traffic is routed to core and frontend properly. - - If you do this, you *must* add your domain to the Caddyfile.dev's - Content-Security-Policy or your site won't work. You will need to add two - entries: One for domain.com:\* and one for api.domain.com:\* + - If you want to customize which domains your frontend is allowed to connect to + you must copy the [Caddyfile from frontend](https://github.com/deso-protocol/frontend/blob/main/Caddyfile) into this directory and set the `CADDY_FILE` + variable in [dev.env](https://github.com/deso-protocol/run/blob/main/dev.env). * Add the necessary nginx configuration for your SSL certificates generated by letsencrypt * Set the TWILIO\* flags to allow new users to get some starter DeSo. * Set a SUPPORT\_EMAIL so your users can contact you if they run into trouble. diff --git a/dev.env b/dev.env index 5a35b71..56ffc0b 100644 --- a/dev.env +++ b/dev.env @@ -41,15 +41,15 @@ ADD_IPS= ADD_SEEDS= # admin_public_keys is list of public keys delimited by a space -# which gives users access to the admin panel. If '*' is specified -# anyone can access the admin panel. +# which gives users access to the admin panel. If '*' is specified +# anyone can access the admin panel. ADMIN_PUBLIC_KEYS=* # super_admin_public_keys is a list of public keys delimited by a space # which gives users access to the super tab of the admin panel and select endpoints # for these privileged users. At this time, super admins can adjust the reserve price # at which this node will sell $DESO, set the slippage fee applied to $DESO buys, -# and manage verification of users on this node. +# and manage verification of users on this node. SUPER_ADMIN_PUBLIC_KEYS=* # When set, determines the port on which this node will listen for protocol-related @@ -157,7 +157,7 @@ ACCESS_CONTROL_ALLOW_ORIGINS=* # is the default right now. SECURE_HEADER_DEVELOPMENT=true -# These are the domains that our secure middleware will accept requests from. +# These are the domains that our secure middleware will accept requests from. # Accepts a space-separated lists of origin domains. # We also set the HTTP Access-Control-Allow-Origin SECURE_HEADER_ALLOW_HOSTS= @@ -168,7 +168,7 @@ AMPLITUDE_KEY= # Optional. Client-side amplitude API Endpoint. AMPLITUDE_DOMAIN=api.amplitude.com -# Optional. Twilio account SID (string id). Twilio is used for sending +# Optional. Twilio account SID (string id). Twilio is used for sending # verification texts. See twilio documentation for more info. TWILIO_ACCOUNT_SID= @@ -236,7 +236,7 @@ LOG_DB_SUMMARY_SNAPSHOTS=false # / creator coins. SHOW_PROCESSING_SPINNERS=true -# When set to true, unmined BitcoinExchange transactions from peers are +# When set to true, unmined BitcoinExchange transactions from peers are # disregarded. This is OK because we will eventually reprocess this transaction once # it gets mined into a block, although anything that is built on top of it may not # be considered. It's set to false by default because most nodes connect to trusted @@ -257,4 +257,4 @@ GCP_BUCKET_NAME=images.bitclout.com ### Environment vars for the frontend image # Override the Caddyfile with the one in this directory -CADDY_FILE=/app/Caddyfile.dev +# CADDY_FILE=/app/Caddyfile.dev From da6c4e7850cb574c457cefc29bcf2689ecd0ef3f Mon Sep 17 00:00:00 2001 From: maebeam Date: Thu, 9 Dec 2021 12:28:27 -0500 Subject: [PATCH 2/2] spacing --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6ec951..32c97db 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ data in real time! Below are some tips on how take full advantage of your node. - If you do this, you must replace deso.run with your domain in nginx.dev so that your traffic is routed to core and frontend properly. - If you want to customize which domains your frontend is allowed to connect to - you must copy the [Caddyfile from frontend](https://github.com/deso-protocol/frontend/blob/main/Caddyfile) into this directory and set the `CADDY_FILE` - variable in [dev.env](https://github.com/deso-protocol/run/blob/main/dev.env). + you must copy the [Caddyfile from frontend](https://github.com/deso-protocol/frontend/blob/main/Caddyfile) + into this directory and set the `CADDY_FILE` variable in [dev.env](https://github.com/deso-protocol/run/blob/main/dev.env). * Add the necessary nginx configuration for your SSL certificates generated by letsencrypt * Set the TWILIO\* flags to allow new users to get some starter DeSo. * Set a SUPPORT\_EMAIL so your users can contact you if they run into trouble.