From 35f407018ede943e97e38cd07116d849d2e03aed Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 30 May 2019 18:52:56 -0400 Subject: [PATCH] Move templates and secrets into src --- .pre-commit-config.yaml | 2 +- Dockerfile | 2 +- docker-compose.yml | 6 +++--- {secrets => src/secrets}/fullchain.pem | 0 {secrets => src/secrets}/mailarchive_passwd.txt | 0 {secrets => src/secrets}/privkey.pem | 0 {templates => src/templates}/TrustedHosts | 0 {templates => src/templates}/dovecot.conf | 0 {templates => src/templates}/main.cf | 0 {templates => src/templates}/master.cf | 0 {templates => src/templates}/opendkim.conf | 0 {templates => src/templates}/opendmarc.conf | 0 12 files changed, 5 insertions(+), 5 deletions(-) rename {secrets => src/secrets}/fullchain.pem (100%) rename {secrets => src/secrets}/mailarchive_passwd.txt (100%) rename {secrets => src/secrets}/privkey.pem (100%) rename {templates => src/templates}/TrustedHosts (100%) rename {templates => src/templates}/dovecot.conf (100%) rename {templates => src/templates}/main.cf (100%) rename {templates => src/templates}/master.cf (100%) rename {templates => src/templates}/opendkim.conf (100%) rename {templates => src/templates}/opendmarc.conf (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2ac7afe..189b5dd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: args: - --allow-missing-credentials - id: detect-private-key - exclude: secrets/privkey.pem + exclude: src/secrets/privkey.pem - id: end-of-file-fixer exclude: files/(issue|motd) - id: mixed-line-ending diff --git a/Dockerfile b/Dockerfile index 6dd598e..a7982d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN mv /etc/postfix/master.cf /etc/postfix/master.cf.orig RUN mv /etc/default/opendkim /etc/default/opendkim.orig RUN mv /etc/default/opendmarc /etc/default/opendmarc.orig -COPY ./templates ./templates/ +COPY ./src/templates ./templates/ COPY ./src/docker-entrypoint.sh . VOLUME ["/var/log", "/var/spool/postfix"] diff --git a/docker-compose.yml b/docker-compose.yml index 1a50d6f..a2abb7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,11 @@ version: "3.7" secrets: fullchain_pem: - file: ./secrets/fullchain.pem + file: ./src/secrets/fullchain.pem privkey_pem: - file: ./secrets/privkey.pem + file: ./src/secrets/privkey.pem mailarchive_passwd_txt: - file: ./secrets/mailarchive_passwd.txt + file: ./src/secrets/mailarchive_passwd.txt services: diff --git a/secrets/fullchain.pem b/src/secrets/fullchain.pem similarity index 100% rename from secrets/fullchain.pem rename to src/secrets/fullchain.pem diff --git a/secrets/mailarchive_passwd.txt b/src/secrets/mailarchive_passwd.txt similarity index 100% rename from secrets/mailarchive_passwd.txt rename to src/secrets/mailarchive_passwd.txt diff --git a/secrets/privkey.pem b/src/secrets/privkey.pem similarity index 100% rename from secrets/privkey.pem rename to src/secrets/privkey.pem diff --git a/templates/TrustedHosts b/src/templates/TrustedHosts similarity index 100% rename from templates/TrustedHosts rename to src/templates/TrustedHosts diff --git a/templates/dovecot.conf b/src/templates/dovecot.conf similarity index 100% rename from templates/dovecot.conf rename to src/templates/dovecot.conf diff --git a/templates/main.cf b/src/templates/main.cf similarity index 100% rename from templates/main.cf rename to src/templates/main.cf diff --git a/templates/master.cf b/src/templates/master.cf similarity index 100% rename from templates/master.cf rename to src/templates/master.cf diff --git a/templates/opendkim.conf b/src/templates/opendkim.conf similarity index 100% rename from templates/opendkim.conf rename to src/templates/opendkim.conf diff --git a/templates/opendmarc.conf b/src/templates/opendmarc.conf similarity index 100% rename from templates/opendmarc.conf rename to src/templates/opendmarc.conf