diff options
author | 2016-09-19 08:19:16 -0400 | |
---|---|---|
committer | 2016-09-19 08:19:16 -0400 | |
commit | e470524e20a5bf7c5907306b76d41adcb28ac490 (patch) | |
tree | 27ac6464b6d1108e21587b9ce603d9af1315017f | |
parent | Merge branch 'master' of https://github.com/netblue30/firejail (diff) | |
download | firejail-e470524e20a5bf7c5907306b76d41adcb28ac490.tar.gz firejail-e470524e20a5bf7c5907306b76d41adcb28ac490.tar.zst firejail-e470524e20a5bf7c5907306b76d41adcb28ac490.zip |
remove man firejail-config
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | src/man/firecfg.txt | 1 | ||||
-rw-r--r-- | src/man/firejail-config.txt | 109 | ||||
-rw-r--r-- | src/man/firejail-login.txt | 1 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 1 | ||||
-rw-r--r-- | src/man/firejail.txt | 1 | ||||
-rw-r--r-- | src/man/firemon.txt | 1 |
7 files changed, 1 insertions, 115 deletions
diff --git a/Makefile.in b/Makefile.in index 95b07c170..54037e6ac 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,7 +1,7 @@ | |||
1 | all: apps man | 1 | all: apps man |
2 | MYLIBS = src/lib | 2 | MYLIBS = src/lib |
3 | APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit | 3 | APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit |
4 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-config.5 | 4 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 |
5 | 5 | ||
6 | prefix=@prefix@ | 6 | prefix=@prefix@ |
7 | exec_prefix=@exec_prefix@ | 7 | exec_prefix=@exec_prefix@ |
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt index 4acacb071..b9d336c4c 100644 --- a/src/man/firecfg.txt +++ b/src/man/firecfg.txt | |||
@@ -80,6 +80,5 @@ Homepage: http://firejail.wordpress.com | |||
80 | \&\flfiremon\fR\|(1), | 80 | \&\flfiremon\fR\|(1), |
81 | \&\flfirejail-profile\fR\|(5), | 81 | \&\flfirejail-profile\fR\|(5), |
82 | \&\flfirejail-login\fR\|(5) | 82 | \&\flfirejail-login\fR\|(5) |
83 | \&\flfirejail-config\fR\|(5) | ||
84 | 83 | ||
85 | 84 | ||
diff --git a/src/man/firejail-config.txt b/src/man/firejail-config.txt deleted file mode 100644 index 386eda976..000000000 --- a/src/man/firejail-config.txt +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | .TH FIREJAIL-CONFIG 5 "MONTH YEAR" "VERSION" "firejail.config man page" | ||
2 | .SH NAME | ||
3 | firejail.config \- Firejail run time configuration file | ||
4 | |||
5 | .SH DESCRIPTION | ||
6 | /etc/firejail/firejail.config is the system-wide configuration file for Firejail. | ||
7 | It allows the system administrator to enable or disable a number of | ||
8 | features and Linux kernel security technologies used by Firejail sandbox. | ||
9 | The file contains keyword-argument pairs, one per line. | ||
10 | Use 'yes' or 'no' as configuration values. | ||
11 | |||
12 | Note that some of these features can also be enabled or disabled at compile | ||
13 | time. Most features are enabled by default both at compile time and | ||
14 | at run time. | ||
15 | |||
16 | .TP | ||
17 | \fBbind | ||
18 | Enable or disable bind support, default enabled. | ||
19 | |||
20 | .TP | ||
21 | \fBchroot | ||
22 | Enable or disable chroot support, default enabled. | ||
23 | |||
24 | .TP | ||
25 | \fBfile-transfer | ||
26 | Enable or disable file transfer support, default enabled. | ||
27 | |||
28 | .TP | ||
29 | \fBforce-nonewprivs | ||
30 | Force use of nonewprivs. This mitigates the possibility of | ||
31 | a user abusing firejail's features to trick a privileged (suid | ||
32 | or file capabilities) process into loading code or configuration | ||
33 | that is partially under their control. Default disabled. | ||
34 | |||
35 | .TP | ||
36 | \fBnetwork | ||
37 | Enable or disable networking features, default enabled. | ||
38 | |||
39 | .TP | ||
40 | \fBrestricted-network | ||
41 | Enable or disable restricted network support, default disabled. If enabled, | ||
42 | networking features should also be enabled (network yes). | ||
43 | Restricted networking grants access to --interface, --net=ethXXX and | ||
44 | \-\-netfilter only to root user. Regular users are only allowed --net=none. | ||
45 | |||
46 | .TP | ||
47 | \fBsecomp | ||
48 | Enable or disable seccomp support, default enabled. | ||
49 | |||
50 | .TP | ||
51 | \fBuserns | ||
52 | Enable or disable user namespace support, default enabled. | ||
53 | |||
54 | .TP | ||
55 | \fBwhitelist | ||
56 | Enable or disable whitelisting support, default enabled. | ||
57 | |||
58 | .TP | ||
59 | \fBx11 | ||
60 | Enable or disable X11 sandboxing support, default enabled. | ||
61 | |||
62 | .TP | ||
63 | \fBxephyr-screen | ||
64 | Screen size for --x11=xephyr, default 800x600. Run /usr/bin/xrandr for | ||
65 | a full list of resolutions available on your specific setup. Examples: | ||
66 | .br | ||
67 | |||
68 | .br | ||
69 | xephyr-screen 640x480 | ||
70 | .br | ||
71 | xephyr-screen 800x600 | ||
72 | .br | ||
73 | xephyr-screen 1024x768 | ||
74 | .br | ||
75 | xephyr-screen 1280x1024 | ||
76 | |||
77 | .TP | ||
78 | \fBxephyr-window-title | ||
79 | Firejail window title in Xephyr, default enabled. | ||
80 | |||
81 | .TP | ||
82 | \fBxephyr-extra-params | ||
83 | Xephyr command extra parameters. None by default, and the declaration is commented out. Examples: | ||
84 | .br | ||
85 | |||
86 | .br | ||
87 | xephyr-extra-params -keybd ephyr,,,xkbmodel=evdev | ||
88 | .br | ||
89 | xephyr-extra-params -grayscale | ||
90 | |||
91 | .SH COMPILE TIME CONFIGURATION | ||
92 | Most of the features described in this file can also be configured at compile time, please run \fB./configure --help\fR for more details. | ||
93 | |||
94 | .SH FILES | ||
95 | /etc/firejail/firejail.config | ||
96 | |||
97 | .SH LICENSE | ||
98 | Firejail is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. | ||
99 | .PP | ||
100 | Homepage: http://firejail.wordpress.com | ||
101 | .SH SEE ALSO | ||
102 | \&\flfirejail\fR\|(1), | ||
103 | \&\flfiremon\fR\|(1), | ||
104 | \&\flfirecfg\fR\|(1), | ||
105 | \&\flfirejail-profile\fR\|(5) | ||
106 | \&\flfirejail-login\fR\|(5) | ||
107 | |||
108 | |||
109 | |||
diff --git a/src/man/firejail-login.txt b/src/man/firejail-login.txt index 464551202..691217253 100644 --- a/src/man/firejail-login.txt +++ b/src/man/firejail-login.txt | |||
@@ -34,6 +34,5 @@ Homepage: http://firejail.wordpress.com | |||
34 | \&\flfiremon\fR\|(1), | 34 | \&\flfiremon\fR\|(1), |
35 | \&\flfirecfg\fR\|(1), | 35 | \&\flfirecfg\fR\|(1), |
36 | \&\flfirejail-profile\fR\|(5) | 36 | \&\flfirejail-profile\fR\|(5) |
37 | \&\flfirejail-config\fR\|(5) | ||
38 | 37 | ||
39 | 38 | ||
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index 5a959dd83..99e7f6690 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -499,7 +499,6 @@ Homepage: http://firejail.wordpress.com | |||
499 | \&\flfiremon\fR\|(1), | 499 | \&\flfiremon\fR\|(1), |
500 | \&\flfirecfg\fR\|(1), | 500 | \&\flfirecfg\fR\|(1), |
501 | \&\flfirejail-login\fR\|(5) | 501 | \&\flfirejail-login\fR\|(5) |
502 | \&\flfirejail-config\fR\|(5) | ||
503 | 502 | ||
504 | 503 | ||
505 | 504 | ||
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index d654290bf..a906de0c9 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -2042,7 +2042,6 @@ Homepage: http://firejail.wordpress.com | |||
2042 | \&\flfirecfg\fR\|(1), | 2042 | \&\flfirecfg\fR\|(1), |
2043 | \&\flfirejail-profile\fR\|(5), | 2043 | \&\flfirejail-profile\fR\|(5), |
2044 | \&\flfirejail-login\fR\|(5) | 2044 | \&\flfirejail-login\fR\|(5) |
2045 | \&\flfirejail-config\fR\|(5) | ||
2046 | 2045 | ||
2047 | 2046 | ||
2048 | 2047 | ||
diff --git a/src/man/firemon.txt b/src/man/firemon.txt index ef99b0927..bd84401af 100644 --- a/src/man/firemon.txt +++ b/src/man/firemon.txt | |||
@@ -109,6 +109,5 @@ Homepage: http://firejail.wordpress.com | |||
109 | \&\flfirecfg\fR\|(1), | 109 | \&\flfirecfg\fR\|(1), |
110 | \&\flfirejail-profile\fR\|(5), | 110 | \&\flfirejail-profile\fR\|(5), |
111 | \&\flfirejail-login\fR\|(5) | 111 | \&\flfirejail-login\fR\|(5) |
112 | \&\flfirejail-config\fR\|(5) | ||
113 | 112 | ||
114 | 113 | ||