AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Revert "Give timeout to stop docker-compose, SIGKILL clightning"

Browse Source 
This reverts commit 487565658a.
This commit is contained in:
nicolas.dorier
2018-11-05 18:28:01 +09:00
parent 487565658a
commit ac4263d71a
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
btcpay-setup.sh
View File

@@ -270,9 +270,9 @@ Requires=docker.service network-online.target
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t 180'
ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d'
ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" stop'
ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart -t 180'
ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart'
[Install]
WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
@@ -299,7 +299,7 @@ stop on runlevel [!2345]
script
. /etc/profile.d/btcpay-env.sh
cd \"\$(dirname \$BTCPAY_ENV_FILE)\"
docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t 180
docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d
end script" > /etc/init/start_containers.conf
echo -e "BTCPay Server upstart configured in /etc/init/start_containers.conf\n"
initctl reload-configuration
@@ -313,7 +313,7 @@ if [ ! -z "$OLD_BTCPAY_DOCKER_COMPOSE" ] && [ "$OLD_BTCPAY_DOCKER_COMPOSE" != "$
docker-compose -f "$OLD_BTCPAY_DOCKER_COMPOSE" down
fi
docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans -t 180
docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans
# Give SSH key to BTCPay
if [[ -f "$BTCPAY_HOST_SSHKEYFILE" ]]; then