diff --git a/api_auth_docker/Dockerfile b/api_auth_docker/Dockerfile index aa178dc..e109638 100644 --- a/api_auth_docker/Dockerfile +++ b/api_auth_docker/Dockerfile @@ -7,8 +7,7 @@ RUN apk add --update --no-cache \ fcgiwrap \ spawn-fcgi \ curl \ - jq \ - su-exec + jq COPY auth.sh /etc/nginx/conf.d/ COPY default.conf /etc/nginx/conf.d/default.conf diff --git a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml index 00b7c74..b53e149 100644 --- a/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml +++ b/cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml @@ -330,7 +330,6 @@ services: - "<%= logs_datapath %>:/cnlogs" - "<%= otsclient_datapath %>:/otsfiles" - "<%= bitcoin_datapath %>/bitcoin-client.conf:/.bitcoin/bitcoin.conf:ro" - command: $USER /script/startotsclient.sh networks: - cyphernodenet <% if ( docker_mode === 'swarm' ) { %> diff --git a/dist/setup.sh b/dist/setup.sh index c04b5f4..895c709 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -110,7 +110,7 @@ sudo_if_required() { } modify_permissions() { - local directories=("installer" "gatekeeper" "lightning" "bitcoin" "docker-compose.yaml" "traefik" "tor" "$BITCOIN_DATAPATH" "$LIGHTNING_DATAPATH" "$PROXY_DATAPATH" "$GATEKEEPER_DATAPATH" "$OTSCLIENT_DATAPATH" "$LOGS_DATAPATH" "$TRAEFIK_DATAPATH" "$TOR_DATAPATH") + local directories=("$BITCOIN_DATAPATH" "$LIGHTNING_DATAPATH" "$PROXY_DATAPATH" "$GATEKEEPER_DATAPATH" "$OTSCLIENT_DATAPATH" "$LOGS_DATAPATH" "$TRAEFIK_DATAPATH" "$TOR_DATAPATH") for d in "${directories[@]}" do if [[ -e $d ]]; then @@ -343,11 +343,6 @@ compare_bitcoinconf() { status='reindex' fi - if [[ ! $new_testnet == $old_testnet || ! $new_regtest == $old_regtest ]]; then - # warn about reindexing - status='incompatible' - fi - echo $status }