Attachment #391872 for bug #519716




*-d, --digest-file*='<digest-file>'::
    Specify the location of the 'digest.cache' file. If this option is
    not given, 'fwknopd' will use the compile-time default location (typically
    '@localstatedir@/fwknop/digest.cache').

*-D, --dump-config*::
    Dump the configuration values that *fwknopd* derives from the

*-p, --pid-file*='<pid-file>'::
    Specify the location of the 'fwknopd.pid' file. If this option is
    not given, 'fwknopd' will use the compile-time default location (typically
    '@localstatedir@/fwknop/fwknopd.pid).

*-P, --pcap-filter*='<filter>'::
    Specify a Berkeley packet filter statement on the *fwknopd* command

*--rotate-digest-cache*::
    Rotate the digest cache file by renaming it to ``<name>-old'', and
    starting a new one. The digest cache file is typically found in
    '@localstatedir@/fwknop/digest.cache'.

*-r, --run-dir*='<path>'::
    Specify the directory where *fwknopd* writes run time state files. The
    default is '@localstatedir@'.

*-S, --status*::
    Display the status of any *fwknopd* processes that may or not be


*FWKNOP_RUN_DIR* '<path>'::
    Specify the directory where *fwknopd* writes run time state files. The
    default is '@localstatedir@'.

ACCESS.CONF VARIABLES
~~~~~~~~~~~~~~~~~~~~~

Lines 1-6 Link Here

(-)a/extras/apparmor/usr.sbin.fwknopd (-2 lines)
1	# Last Modified: Sun Aug 18 22:54:57 2013	1	# Last Modified: Sun Aug 18 22:54:57 2013
2	# Assumes fwknopd was built with:
3	# './configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var'
4	#include <tunables/global>	2	#include <tunables/global>
5		3
6	/usr/sbin/fwknopd {	4	/usr/sbin/fwknopd {

Lines 8-14 Link Here

(-)a/fwknop.spec (-1 / +1 lines)
8	%define _libdir /usr/lib	8	%define _libdir /usr/lib
9	%endif	9	%endif
10	%define _sysconfdir /etc	10	%define _sysconfdir /etc
11	%define _localstatedir /var	11	%define _localstatedir /run
12	%define _infodir /usr/share/info	12	%define _infodir /usr/share/info
13	%define _mandir /usr/share/man	13	%define _mandir /usr/share/man
14		14




file\&. If this option is not given,
\fIfwknopd\fR
will use the compile\-time default location (typically
\fI@localstatedir@/fwknop/digest\&.cache\fR)\&.
.RE
.PP
\fB\-D, \-\-dump\-config\fR

\fIfwknopd\&.pid\fR
file\&. If this option is not given,
\fIfwknopd\fR
will use the compile\-time default location (typically \*(Aq@localstatedir@/fwknop/fwknopd\&.pid)\&.
.RE
.PP
\fB\-P, \-\-pcap\-filter\fR=\fI<filter>\fR

\fB\-\-rotate\-digest\-cache\fR
.RS 4
Rotate the digest cache file by renaming it to \(lq<name>\-old\(rq, and starting a new one\&. The digest cache file is typically found in
\fI@localstatedir@/fwknop/digest\&.cache\fR\&.
.RE
.PP
\fB\-r, \-\-run\-dir\fR=\fI<path>\fR

Specify the directory where
\fBfwknopd\fR
writes run time state files\&. The default is
\fI@localstatedir@\fR\&.
.RE
.PP
\fB\-S, \-\-status\fR

Specify the directory where
\fBfwknopd\fR
writes run time state files\&. The default is
\fI@localstatedir@\fR\&.
.RE
.PP
\fBENABLE_DESTINATION_RULE\fR \fI<Y/N>\fR

Lines 494-500 Link Here

(-)a/server/fwknopd.conf (-1 / +1 lines)
494		494
495	# Directories - These can override compile-time defaults.	495	# Directories - These can override compile-time defaults.
496	#	496	#
497	#FWKNOP_RUN_DIR /var/run/fwknop;	497	#FWKNOP_RUN_DIR /run/fwknop;
498	#FWKNOP_CONF_DIR /etc/fwknop;	498	#FWKNOP_CONF_DIR /etc/fwknop;
499		499
500	# Files	500	# Files

Lines 70-76 Link Here

(-)a/server/fwknopd_common.h (-1 / +1 lines)
70	/* Our default run directory is based on LOCALSTATEDIR as set by the	70	/* Our default run directory is based on LOCALSTATEDIR as set by the
71	* configure script. This is where we put the PID and digest cache files.	71	* configure script. This is where we put the PID and digest cache files.
72	*/	72	*/
73	#define DEF_RUN_DIR SYSRUNDIR"/run/"PACKAGE_NAME	73	#define DEF_RUN_DIR SYSRUNDIR"/"PACKAGE_NAME
74	#endif	74	#endif
75		75
76	/* More Conf defaults	76	/* More Conf defaults

Return to bug 519716

Lines 68-74 COMMAND-LINE OPTIONS Link Here

(-)a/doc/fwknopd.man.asciidoc (-5 / +5 lines)
68	-d, --digest-file='<digest-file>'::	68	-d, --digest-file='<digest-file>'::
69	Specify the location of the 'digest.cache' file. If this option is	69	Specify the location of the 'digest.cache' file. If this option is
70	not given, 'fwknopd' will use the compile-time default location (typically	70	not given, 'fwknopd' will use the compile-time default location (typically
71	'@localstatedir@/run/fwknop/digest.cache').	71	'@localstatedir@/fwknop/digest.cache').
72		72
73	-D, --dump-config::	73	-D, --dump-config::
74	Dump the configuration values that fwknopd derives from the	74	Dump the configuration values that fwknopd derives from the
Lines 131-137 COMMAND-LINE OPTIONS Link Here
131	-p, --pid-file='<pid-file>'::	131	-p, --pid-file='<pid-file>'::
132	Specify the location of the 'fwknopd.pid' file. If this option is	132	Specify the location of the 'fwknopd.pid' file. If this option is
133	not given, 'fwknopd' will use the compile-time default location (typically	133	not given, 'fwknopd' will use the compile-time default location (typically
134	'@localstatedir@/run/fwknop/fwknopd.pid).	134	'@localstatedir@/fwknop/fwknopd.pid).
135		135
136	-P, --pcap-filter='<filter>'::	136	-P, --pcap-filter='<filter>'::
137	Specify a Berkeley packet filter statement on the fwknopd command	137	Specify a Berkeley packet filter statement on the fwknopd command
Lines 165-175 COMMAND-LINE OPTIONS Link Here
165	--rotate-digest-cache::	165	--rotate-digest-cache::
166	Rotate the digest cache file by renaming it to ``<name>-old'', and	166	Rotate the digest cache file by renaming it to ``<name>-old'', and
167	starting a new one. The digest cache file is typically found in	167	starting a new one. The digest cache file is typically found in
168	'@localstatedir@/run/fwknop/digest.cache'.	168	'@localstatedir@/fwknop/digest.cache'.
169		169
170	-r, --run-dir='<path>'::	170	-r, --run-dir='<path>'::
171	Specify the directory where fwknopd writes run time state files. The	171	Specify the directory where fwknopd writes run time state files. The
172	default is '@localstatedir@/run'.	172	default is '@localstatedir@'.
173		173
174	-S, --status::	174	-S, --status::
175	Display the status of any fwknopd processes that may or not be	175	Display the status of any fwknopd processes that may or not be
Lines 396-402 See the '@sysconfdir@/fwknop/fwknopd.conf' file for the full list and correspond Link Here
396		396
397	FWKNOP_RUN_DIR '<path>'::	397	FWKNOP_RUN_DIR '<path>'::
398	Specify the directory where fwknopd writes run time state files. The	398	Specify the directory where fwknopd writes run time state files. The
399	default is '@localstatedir@/run'.	399	default is '@localstatedir@'.
400		400
401	ACCESS.CONF VARIABLES	401	ACCESS.CONF VARIABLES
402	~~~~~~~~~~~~~~~~~~~~~	402	~~~~~~~~~~~~~~~~~~~~~

Lines 94-100 Specify the location of the Link Here

(-)a/server/fwknopd.8.in (-5 / +5 lines)
94	file\&. If this option is not given,	94	file\&. If this option is not given,
95	\fIfwknopd\fR	95	\fIfwknopd\fR
96	will use the compile\-time default location (typically	96	will use the compile\-time default location (typically
97	\fI@localstatedir@/run/fwknop/digest\&.cache\fR)\&.	97	\fI@localstatedir@/fwknop/digest\&.cache\fR)\&.
98	.RE	98	.RE
99	.PP	99	.PP
100	\fB\-D, \-\-dump\-config\fR	100	\fB\-D, \-\-dump\-config\fR
Lines 196-202 Specify the location of the Link Here
196	\fIfwknopd\&.pid\fR	196	\fIfwknopd\&.pid\fR
197	file\&. If this option is not given,	197	file\&. If this option is not given,
198	\fIfwknopd\fR	198	\fIfwknopd\fR
199	will use the compile\-time default location (typically \*(Aq@localstatedir@/run/fwknop/fwknopd\&.pid)\&.	199	will use the compile\-time default location (typically \*(Aq@localstatedir@/fwknop/fwknopd\&.pid)\&.
200	.RE	200	.RE
201	.PP	201	.PP
202	\fB\-P, \-\-pcap\-filter\fR=\fI<filter>\fR	202	\fB\-P, \-\-pcap\-filter\fR=\fI<filter>\fR
Lines 244-250 files\&. This will also force a flush of the current \(lqFWKNOP\(rq iptables cha Link Here
244	\fB\-\-rotate\-digest\-cache\fR	244	\fB\-\-rotate\-digest\-cache\fR
245	.RS 4	245	.RS 4
246	Rotate the digest cache file by renaming it to \(lq<name>\-old\(rq, and starting a new one\&. The digest cache file is typically found in	246	Rotate the digest cache file by renaming it to \(lq<name>\-old\(rq, and starting a new one\&. The digest cache file is typically found in
247	\fI@localstatedir@/run/fwknop/digest\&.cache\fR\&.	247	\fI@localstatedir@/fwknop/digest\&.cache\fR\&.
248	.RE	248	.RE
249	.PP	249	.PP
250	\fB\-r, \-\-run\-dir\fR=\fI<path>\fR	250	\fB\-r, \-\-run\-dir\fR=\fI<path>\fR
Lines 252-258 Rotate the digest cache file by renaming it to \(lq<name>\-old\(rq, and starting Link Here
252	Specify the directory where	252	Specify the directory where
253	\fBfwknopd\fR	253	\fBfwknopd\fR
254	writes run time state files\&. The default is	254	writes run time state files\&. The default is
255	\fI@localstatedir@/run\fR\&.	255	\fI@localstatedir@\fR\&.
256	.RE	256	.RE
257	.PP	257	.PP
258	\fB\-S, \-\-status\fR	258	\fB\-S, \-\-status\fR
Lines 524-530 Override syslog facility\&. The \(lqSYSLOG_FACILITY\(rq variable can be set to Link Here
524	Specify the directory where	524	Specify the directory where
525	\fBfwknopd\fR	525	\fBfwknopd\fR
526	writes run time state files\&. The default is	526	writes run time state files\&. The default is
527	\fI@localstatedir@/run\fR\&.	527	\fI@localstatedir@\fR\&.
528	.RE	528	.RE
529	.PP	529	.PP
530	\fBENABLE_DESTINATION_RULE\fR \fI<Y/N>\fR	530	\fBENABLE_DESTINATION_RULE\fR \fI<Y/N>\fR