fix cyberfox profile

5 files changed, 9 insertions, 3 deletions

diff --git a/Makefile.in b/Makefile.in
index 0903e3b8d..3083ba19e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,6 +224,7 @@ realinstall:
         install -c -m 0644 .etc/atom.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/jitsi.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/eom.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/Cyberfox.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
         install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.
         rm -fr .etc
diff --git a/README b/README
index bbf138085..dc9d8a3b0 100644
--- a/README
+++ b/README
@@ -25,6 +25,8 @@ Reiner Herrmann (https://github.com/reinerh)
         - clang-analyzer fixes
         - Debian reproducible build
         - unit testing framework
+Thomas Jarosch (https://github.com/thomasjfox)
+        - disable keepassx in disable-passwdmgr.inc
 Niklas Haas (https://github.com/haasn)
         - blacklisting for keybase.io's client
 Aleksey Manevich (https://github.com/manevich)
diff --git a/etc/Cyberfox.profile b/etc/Cyberfox.profile
new file mode 100644
index 000000000..1f74606ce
--- /dev/null
+++ b/etc/Cyberfox.profile
@@ -0,0 +1,3 @@
+# Firejail profile for Cyberfox (based on Mozilla Firefox)
+
+include /etc/firejail/cyberfox.profile
diff --git a/etc/cyberfox.profile b/etc/cyberfox.profile
index 0035b6be6..afa77d1d4 100644
--- a/etc/cyberfox.profile
+++ b/etc/cyberfox.profile
@@ -1,6 +1,6 @@
 # Firejail profile for Cyberfox (based on Mozilla Firefox)
 
-noblacklist ~/.8pecxstudios/cyberfox
+noblacklist ~/.8pecxstudios
 noblacklist ~/.cache/8pecxstudios
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
@@ -19,8 +19,7 @@ mkdir ~/.8pecxstudios
 whitelist ~/.8pecxstudios
 mkdir ~/.cache
 mkdir ~/.cache/8pecxstudios
-mkdir ~/.cache/8pecxstudios/cyberfox
-whitelist ~/.cache/8pecxstudios/cyberfox
+whitelist ~/.cache/8pecxstudios
 whitelist ~/dwhelper
 whitelist ~/.zotero
 whitelist ~/.vimperatorrc
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 24884228e..be302f833 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -94,6 +94,7 @@
 /etc/firejail/google-play-music-desktop-player.profile
 /etc/firejail/quiterss.profile
 /etc/firejail/cyberfox.profile
+/etc/firejail/Cyberfox.profile
 /etc/firejail/snap.profile
 /etc/firejail/xplayer.profile
 /etc/firejail/xreader.profile