Merge pull request #180 from avoidr/google-chrome-stable

add google-chrome{,-stable,-beta,-unstable}.profile

9 files changed, 35 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index 3ae71a230..143ac5975 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,6 +85,9 @@ realinstall:
         install -c -m 0644 .etc/chromium-browser.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/chromium.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/google-chrome.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/google-chrome-stable.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/google-chrome-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/google-chrome-unstable.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/disable-mgmt.inc $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/disable-secret.inc $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/disable-common.inc $(DESTDIR)/$(sysconfdir)/firejail/.
diff --git a/etc/chromium-browser.profile b/etc/chromium-browser.profile
index 4cdc098d1..d989b736b 100644
--- a/etc/chromium-browser.profile
+++ b/etc/chromium-browser.profile
@@ -1,3 +1,2 @@
 # Chromium browser profile
 include /etc/firejail/chromium.profile
-
diff --git a/etc/chromium-common.profile b/etc/chromium-common.profile
new file mode 100644
index 000000000..25eab0707
--- /dev/null
+++ b/etc/chromium-common.profile
@@ -0,0 +1,12 @@
+# Chromium browser profile
+include /etc/firejail/disable-mgmt.inc
+include /etc/firejail/disable-secret.inc
+include /etc/firejail/disable-common.inc
+
+# chromium is distributed with a perl script on Arch
+# include /etc/firejail/disable-devel.inc
+#
+
+netfilter
+whitelist ${DOWNLOADS}
+include /etc/firejail/whitelist-common.inc
diff --git a/etc/chromium.profile b/etc/chromium.profile
index 981c61339..c3a7a186c 100644
--- a/etc/chromium.profile
+++ b/etc/chromium.profile
@@ -1,17 +1,4 @@
 # Chromium browser profile
 noblacklist ${HOME}/.config/chromium
-noblacklist ${HOME}/.config/google-chrome
-include /etc/firejail/disable-mgmt.inc
-include /etc/firejail/disable-secret.inc
-include /etc/firejail/disable-common.inc
-
-# chromium is distributed with a perl script on Arch
-# include /etc/firejail/disable-devel.inc
-#
-
-netfilter
-whitelist ${DOWNLOADS}
 whitelist ~/.config/chromium
-whitelist ~/.config/google-chrome
-include /etc/firejail/whitelist-common.inc
-
+include /etc/firejail/chromium-common.profile
diff --git a/etc/google-chrome-beta.profile b/etc/google-chrome-beta.profile
new file mode 100644
index 000000000..0f7078adc
--- /dev/null
+++ b/etc/google-chrome-beta.profile
@@ -0,0 +1,4 @@
+# Chromium browser profile
+noblacklist ${HOME}/.config/google-chrome-beta
+whitelist ~/.config/google-chrome-beta
+include /etc/firejail/chromium-common.profile
diff --git a/etc/google-chrome-stable.profile b/etc/google-chrome-stable.profile
new file mode 100644
index 000000000..3cc58c4d2
--- /dev/null
+++ b/etc/google-chrome-stable.profile
@@ -0,0 +1,4 @@
+# Chromium browser profile
+noblacklist ${HOME}/.config/google-chrome
+whitelist ~/.config/google-chrome
+include /etc/firejail/chromium-common.profile
diff --git a/etc/google-chrome-unstable.profile b/etc/google-chrome-unstable.profile
new file mode 100644
index 000000000..db184419d
--- /dev/null
+++ b/etc/google-chrome-unstable.profile
@@ -0,0 +1,4 @@
+# Chromium browser profile
+noblacklist ${HOME}/.config/google-chrome-unstable
+whitelist ~/.config/google-chrome-unstable
+include /etc/firejail/chromium-common.profile
diff --git a/etc/google-chrome.profile b/etc/google-chrome.profile
index 4cdc098d1..3cc58c4d2 100644
--- a/etc/google-chrome.profile
+++ b/etc/google-chrome.profile
@@ -1,3 +1,4 @@
 # Chromium browser profile
-include /etc/firejail/chromium.profile
-
+noblacklist ${HOME}/.config/google-chrome
+whitelist ~/.config/google-chrome
+include /etc/firejail/chromium-common.profile
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 6aeb9d5f4..ea17a121e 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -1,13 +1,16 @@
 /etc/firejail/evince.profile
 /etc/firejail/disable-secret.inc
 /etc/firejail/chromium.profile
+/etc/firejail/chromium-browser.profile
 /etc/firejail/google-chrome.profile
+/etc/firejail/google-chrome-stable.profile
+/etc/firejail/google-chrome-beta.profile
+/etc/firejail/google-chrome-unstable.profile
 /etc/firejail/midori.profile
 /etc/firejail/icedove.profile
 /etc/firejail/iceweasel.profile
 /etc/firejail/dropbox.profile
 /etc/firejail/login.users
-/etc/firejail/chromium-browser.profile
 /etc/firejail/disable-mgmt.inc
 /etc/firejail/firefox.profile
 /etc/firejail/opera.profile