diff options
| author | Romain Francoise <rfrancoise@debian.org> | 2014-10-21 19:28:38 +0200 |
|---|---|---|
| committer | Romain Francoise <rfrancoise@debian.org> | 2014-10-21 19:28:38 +0200 |
| commit | 2b8de74ff4c334c25e89988c4a401b24b5bcf03d (patch) | |
| tree | 10fb49ca94bfd0c8b8a583412281abfc0186836e /man | |
| parent | 81c63b0eed39432878f78727f60a1e7499645199 (diff) | |
| download | vyos-strongswan-2b8de74ff4c334c25e89988c4a401b24b5bcf03d.tar.gz vyos-strongswan-2b8de74ff4c334c25e89988c4a401b24b5bcf03d.zip | |
Import upstream release 5.2.1
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 6 | ||||
| -rw-r--r-- | man/Makefile.in | 17 | ||||
| -rw-r--r-- | man/ipsec.conf.5.in | 5 |
3 files changed, 21 insertions, 7 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index fbc78b9ac..5f9a938d7 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,9 @@ -man_MANS = \ +man_MANS = + +if USE_FILE_CONFIG + man_MANS += \ ipsec.conf.5 \ ipsec.secrets.5 +endif CLEANFILES = $(man_MANS) diff --git a/man/Makefile.in b/man/Makefile.in index bd3141dfa..08aee19c0 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -77,6 +77,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@USE_FILE_CONFIG_TRUE@am__append_1 = \ +@USE_FILE_CONFIG_TRUE@ ipsec.conf.5 \ +@USE_FILE_CONFIG_TRUE@ ipsec.secrets.5 + subdir = man DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/ipsec.conf.5.in $(srcdir)/ipsec.secrets.5.in @@ -180,6 +184,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GEM = @GEM@ GENHTML = @GENHTML@ GPERF = @GPERF@ GPRBUILD = @GPRBUILD@ @@ -240,6 +245,7 @@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RTLIB = @RTLIB@ RUBY = @RUBY@ +RUBYGEMDIR = @RUBYGEMDIR@ RUBYINCLUDE = @RUBYINCLUDE@ RUBYLIB = @RUBYLIB@ SED = @SED@ @@ -305,6 +311,8 @@ ipsecdir = @ipsecdir@ ipsecgroup = @ipsecgroup@ ipseclibdir = @ipseclibdir@ ipsecuser = @ipsecuser@ +json_CFLAGS = @json_CFLAGS@ +json_LIBS = @json_LIBS@ libdir = @libdir@ libexecdir = @libexecdir@ linux_headers = @linux_headers@ @@ -352,6 +360,10 @@ strongswan_conf = @strongswan_conf@ strongswan_options = @strongswan_options@ swanctldir = @swanctldir@ sysconfdir = @sysconfdir@ +systemd_daemon_CFLAGS = @systemd_daemon_CFLAGS@ +systemd_daemon_LIBS = @systemd_daemon_LIBS@ +systemd_journal_CFLAGS = @systemd_journal_CFLAGS@ +systemd_journal_LIBS = @systemd_journal_LIBS@ systemdsystemunitdir = @systemdsystemunitdir@ t_plugins = @t_plugins@ target_alias = @target_alias@ @@ -361,10 +373,7 @@ top_srcdir = @top_srcdir@ urandom_device = @urandom_device@ xml_CFLAGS = @xml_CFLAGS@ xml_LIBS = @xml_LIBS@ -man_MANS = \ - ipsec.conf.5 \ - ipsec.secrets.5 - +man_MANS = $(am__append_1) CLEANFILES = $(man_MANS) all: all-am diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in index 0f8564a1e..fe37dff83 100644 --- a/man/ipsec.conf.5.in +++ b/man/ipsec.conf.5.in @@ -795,8 +795,9 @@ or prefix in front of 0x or 0s, the public key is expected to be in either the RFC 3110 (not the full RR, only RSA key part) or RFC 4253 public key format, respectively. -Also accepted is the path to a file containing the public key in PEM or DER -encoding. +Also accepted is the path to a file containing the public key in PEM, DER or SSH +encoding. Both absolute paths or paths relative to \fI/etc/ipsec.d/certs\fP +are accepted. .TP .BR leftsendcert " = never | no | " ifasked " | always | yes" Accepted values are |