init-repo #4

Merged
fedy95 merged 2 commits from init-repo into master 4 years ago
  1. 4
      Makefile
  2. 5
      docker-compose.yml
  3. 8
      init.sh

4
Makefile

@ -9,4 +9,8 @@ lint-yaml:
docker pull ${REGISTRY}/${YAMLLINT_TAG} docker pull ${REGISTRY}/${YAMLLINT_TAG}
$(LINT-YAML-CMD) docker-compose.yml $(LINT-YAML-CMD) docker-compose.yml
run:
docker-compose down
docker-compose up -d --build
.DEFAULT_GOAL := lint-yaml .DEFAULT_GOAL := lint-yaml

5
docker-compose.yml

@ -9,8 +9,5 @@ services:
env_file: env/instance.env env_file: env/instance.env
volumes: volumes:
- ./etc/instance/rui.crt:/rui.crt
- ./etc/instance/fullchain.pem:/fullchain.pem
- ./etc/instance/rui.key:/rui.key
- ./etc/instance/ca-cert.pem:/ca-cert.pem
- ./etc/instance/etc/vmware/ssl:/etc/vmware/ssl/
... ...

8
init.sh

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
./acme.sh --install -m "${EMAIL}" ./acme.sh --install -m "${EMAIL}"
./acme.sh --issue --debug --dns dns_gd -d "${DOMAIN}" \ ./acme.sh --issue --debug --dns dns_gd -d "${DOMAIN}" \
--cert-file /rui.crt \
--key-file /rui.key \
--fullchain-file /fullchain.pem \
--capath /ca-cert.pem
--cert-file /etc/vmware/ssl/rui.crt \
--key-file /etc/vmware/ssl/rui.key \
--fullchain-file /etc/vmware/ssl/fullchain.pem \
--capath /etc/vmware/ssl/ca-cert.pem