diff --git a/.env.sample b/.env.sample index 06247d3..b66d340 100644 --- a/.env.sample +++ b/.env.sample @@ -15,7 +15,7 @@ SECRET_DB_PASSWORD_VERSION=v1 # Comment out these lines if you want to store the peertube secret in a config file instead of a docker secret COMPOSE_FILE="$COMPOSE_FILE:compose.peertube-secret.yml" -SECRET_PEERTUBE_SECRET_VERSION=v1 +SECRET_PEERTUBE_SECRET_VERSION=v1 # length=32 ## Webseed backend # diff --git a/README.md b/README.md index 791a5e2..b1a69e7 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,10 @@ An ActivityPub-federated video streaming platform using P2P directly in your web 1. Set up Docker Swarm and [`abra`] 2. Deploy [`coop-cloud/traefik`] 3. `abra app new peertube` -4. `abra app cmd -l YOURAPPDOMAIN generate_secret` -5. `abra app secret generate YOURAPPDOMAIN -a` -6. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to - your Docker swarm box -7. `abra app deploy YOURAPPDOMAIN` -8. Open the configured domain in your browser to finish set-up +4. `abra app secret generate YOURAPPDOMAIN -a` +5. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to your Docker swarm box +6. `abra app deploy YOURAPPDOMAIN` +7. Open the configured domain in your browser to finish set-up ## Host-mode networking diff --git a/abra.sh b/abra.sh index 76ca158..76db0c5 100644 --- a/abra.sh +++ b/abra.sh @@ -3,10 +3,6 @@ export NGINX_CONFIG_VERSION=v8 export APP_ENTRYPOINT_VERSION=v7 -generate_secret() { - abra app secret insert "$APP_NAME" peertube_secret v1 "$(openssl rand -hex 32)" --chaos -} - sub_npm() { abra__service_="app"