Browse Source

COPY certs at the end; removed bogus unused dkim tables

tags/v1.0.3^0
Robin Thoni 7 years ago
parent
commit
340d5a3481
3 changed files with 4 additions and 50 deletions
  1. 2
    2
      dovecot/Dockerfile
  2. 2
    2
      postfix/Dockerfile
  3. 0
    46
      postgresql/docker-entrypoint-initdb.d/01_init.sql

+ 2
- 2
dovecot/Dockerfile View File

@@ -12,8 +12,6 @@ RUN rm -rf /etc/dovecot/*
12 12
 
13 13
 COPY ./config/ /etc/dovecot/
14 14
 
15
-COPY ./certs/ /etc/ssl/private/
16
-
17 15
 COPY ./exim4/ /etc/exim4/
18 16
 
19 17
 RUN chown root:Debian-exim /etc/exim4/passwd.client &&\
@@ -37,3 +35,5 @@ VOLUME ["/var/email"]
37 35
 EXPOSE 110 143 993 995 4190
38 36
 
39 37
 CMD ["/run.sh"]
38
+
39
+COPY ./certs/ /etc/ssl/private/

+ 2
- 2
postfix/Dockerfile View File

@@ -24,8 +24,6 @@ RUN rm -rf /var/log/* &&\
24 24
 
25 25
 COPY ./config/ /etc/postfix/
26 26
 
27
-COPY ./certs/ /etc/ssl/private/
28
-
29 27
 COPY ./vars-vars /etc/vars-vars
30 28
 
31 29
 COPY ./vars-files /etc/vars-files
@@ -35,3 +33,5 @@ COPY ./run.sh /run.sh
35 33
 EXPOSE 25 587
36 34
 
37 35
 CMD ["/run.sh"]
36
+
37
+COPY ./certs/ /etc/ssl/private/

+ 0
- 46
postgresql/docker-entrypoint-initdb.d/01_init.sql View File

@@ -813,53 +813,3 @@ ALTER TABLE recipient_bcc OWNER TO postfixadmin;
813 813
 
814 814
 ALTER TABLE ONLY recipient_bcc
815 815
     ADD CONSTRAINT recipient_bcc_pkey PRIMARY KEY (recipient);
816
-
817
-
818
-
819
-CREATE TABLE dkim_external_ignore_list (
820
-    host text NOT NULL
821
-);
822
-
823
-
824
-ALTER TABLE dkim_external_ignore_list OWNER TO dev;
825
-
826
---
827
---
828
-
829
-CREATE TABLE dkim_internal_hosts (
830
-    host text NOT NULL
831
-);
832
-
833
-
834
-ALTER TABLE dkim_internal_hosts OWNER TO dev;
835
-
836
---
837
---
838
-
839
-CREATE TABLE dkim_key_table (
840
-    name text NOT NULL,
841
-    key_path text NOT NULL
842
-);
843
-
844
-
845
-ALTER TABLE dkim_key_table OWNER TO dev;
846
-
847
---
848
---
849
-
850
-CREATE TABLE dkim_signing_table (
851
-    email text NOT NULL,
852
-    name text NOT NULL
853
-);
854
-
855
-ALTER TABLE ONLY dkim_signing_table
856
-    ADD CONSTRAINT dkim_signing_table_name_fkey FOREIGN KEY (name) REFERENCES dkim_key_table(name) ON UPDATE CASCADE ON DELETE CASCADE;
857
-
858
-
859
---
860
---
861
-

Loading…
Cancel
Save