From e482de832622182f52bb1f7ea3a1829e61aabb0b Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sun, 6 Jun 2021 14:10:58 +0300
Subject: [PATCH 1/2] fix deploy

---
 docker-compose.yml | 6 ++++--
 init.sh            | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index af1b0ff..d73bc45 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,8 @@ services:
 
     env_file: env/instance.env
     volumes:
-      - /usr/syno/etc/ssl/ssl.crt:/usr/syno/etc/ssl/ssl.crt
-      - /usr/syno/etc/ssl/ssl.key:/usr/syno/etc/ssl/ssl.key
+      - /usr/syno/etc/certificate/system/default/cert.pem:/usr/syno/etc/ssl/cert.pem
+      - /usr/syno/etc/certificate/system/default/fullchain.pem:/usr/syno/etc/ssl/fullchain.pem
+      - /usr/syno/etc/certificate/system/default/privkey.pem:/usr/syno/etc/ssl/privkey.pem
+      - /usr/syno/etc/certificate/system/default/syno-ca-cert.pem:/usr/syno/etc/ssl/syno-ca-cert.pem
 ...
diff --git a/init.sh b/init.sh
index 9cc306a..ad3b63e 100755
--- a/init.sh
+++ b/init.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 ./acme.sh --install -m "${EMAIL}"
 ./acme.sh --issue --debug --dns dns_gd -d "${DOMAIN}" \
- --cert-file /usr/syno/etc/ssl/ssl.crt/server.crt \
- --key-file /usr/syno/etc/ssl/ssl.key/server.key \
- --reloadcmd '/usr/syno/sbin/synoservicecfg --reload httpd-sys'
+ --cert-file /usr/syno/etc/ssl/cert.pem \
+ --key-file /usr/syno/etc/ssl/privkey.pem \
+ --fullchain-file /usr/syno/etc/ssl/fullchain.pem \
+ --capath /usr/syno/etc/ssl/syno-ca-cert.pem \
+ --reloadcmd '/usr/syno/sbin/synoservice --reload nginx'
-- 
2.30.2


From 4c5046ba542e0d6cca5892e9f6acabcc907ed228 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sun, 6 Jun 2021 14:11:45 +0300
Subject: [PATCH 2/2] cleanup makefile

---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9b51af2..32411ca 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,9 @@ MAKEFLAGS += --silent
 REGISTRY=registry.fedy95.com
 YAMLLINT_TAG=baseimage-yamllint:latest
 
-lint: lint-yaml
-
 LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG}
 lint-yaml:
 	docker pull ${REGISTRY}/${YAMLLINT_TAG}
 	$(LINT-YAML-CMD) docker-compose.yml
 
-
-.DEFAULT_GOAL := lint
+.DEFAULT_GOAL := lint-yaml
-- 
2.30.2