Move templates and secrets into src

cisagov · May 30, 2019 · 35f4070 · 35f4070
1 parent a031cf0
commit 35f4070
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 → src/secrets/fullchain.pem b/secrets/fullchain.pem → src/secrets/fullchain.pem
diff --git a/secrets/mailarchive_passwd.txt → src/secrets/mailarchive_passwd.txt b/secrets/mailarchive_passwd.txt → src/secrets/mailarchive_passwd.txt
diff --git a/secrets/privkey.pem → src/secrets/privkey.pem b/secrets/privkey.pem → src/secrets/privkey.pem
diff --git a/templates/TrustedHosts → src/templates/TrustedHosts b/templates/TrustedHosts → src/templates/TrustedHosts
diff --git a/templates/dovecot.conf → src/templates/dovecot.conf b/templates/dovecot.conf → src/templates/dovecot.conf
diff --git a/templates/main.cf → src/templates/main.cf b/templates/main.cf → src/templates/main.cf
diff --git a/templates/master.cf → src/templates/master.cf b/templates/master.cf → src/templates/master.cf
diff --git a/templates/opendkim.conf → src/templates/opendkim.conf b/templates/opendkim.conf → src/templates/opendkim.conf
diff --git a/templates/opendmarc.conf → src/templates/opendmarc.conf b/templates/opendmarc.conf → src/templates/opendmarc.conf