Commit 42dfd85d authored by Patrick J Cherry's avatar Patrick J Cherry
Browse files

Merge branch 'jessie' of github.com:BytemarkHosting/symbiosis into jessie

parents a39d3336 b88a480d
...@@ -63,7 +63,7 @@ module Symbiosis ...@@ -63,7 +63,7 @@ module Symbiosis
end end
# #
# Reads and returns the LetsEncrypt configuration # Reads and returns the configuration
# #
def config def config
return @config unless @config.values.compact.empty? return @config unless @config.values.compact.empty?
......
...@@ -7,7 +7,7 @@ snippets := $(shell find $(CURDIR)/$(snippets_dir) -mindepth 1 -regextype po ...@@ -7,7 +7,7 @@ snippets := $(shell find $(CURDIR)/$(snippets_dir) -mindepth 1 -regextype po
ifeq ($(program),dovecot) ifeq ($(program),dovecot)
test_args = -a -c $(conf_tmp) test_args = -a -c $(conf_tmp)
else ifeq ($(program),exim4) else ifeq ($(program),exim4)
test_args = -bV -C $(conf_tmp) test_args = -bV -C $(CURDIR)/$(conf_tmp)
endif endif
all: $(conf) all: $(conf)
......
...@@ -14,9 +14,3 @@ ...@@ -14,9 +14,3 @@
# #
# cd /etc/exim4 # cd /etc/exim4
# make # make
#
# And then restart exim4
#
# /etc/init.d/exim4 restart
#
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment