diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/dkimproxy/dkimproxy.in.confd | 4 | ||||
| -rw-r--r-- | testing/dkimproxy/dkimproxy.out.confd | 4 | ||||
| -rw-r--r-- | testing/dkimproxy/dkimproxy.out.initd | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/testing/dkimproxy/dkimproxy.in.confd b/testing/dkimproxy/dkimproxy.in.confd index e10508a436..96017f2022 100644 --- a/testing/dkimproxy/dkimproxy.in.confd +++ b/testing/dkimproxy/dkimproxy.in.confd @@ -1,3 +1,7 @@ +<<<<<<< HEAD +OPTS="" +======= #OPTS="" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa CONFIGFILE="/etc/dkimproxy/dkimproxy_in.conf" PIDFILE="/var/run/dkimproxy_in.pid" diff --git a/testing/dkimproxy/dkimproxy.out.confd b/testing/dkimproxy/dkimproxy.out.confd index 570b0bc078..b30c4ee2df 100644 --- a/testing/dkimproxy/dkimproxy.out.confd +++ b/testing/dkimproxy/dkimproxy.out.confd @@ -1,3 +1,7 @@ +<<<<<<< HEAD +OPTS="" +======= #OPTS="" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa CONFIGFILE="/etc/dkimproxy/dkimproxy_out.conf" PIDFILE="/var/run/dkimproxy_out.pid" diff --git a/testing/dkimproxy/dkimproxy.out.initd b/testing/dkimproxy/dkimproxy.out.initd index ec1fba8869..d8ff15b360 100644 --- a/testing/dkimproxy/dkimproxy.out.initd +++ b/testing/dkimproxy/dkimproxy.out.initd @@ -1,6 +1,10 @@ #!/sbin/runscript +<<<<<<< HEAD +description="SMTP proxy that verifies signature on incoming messages" +======= description="SMTP proxy that verifies signature on outgoing messages" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa depend() { need net |