summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-01-03 11:52:33 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-01-03 16:55:21 +0100
commit66157930919fbb136e53f4b8ae06e79aaa85c2e8 (patch)
tree5316cd4a7143ed32b3debe0ebd324dcac205639e
parent18e2ced8231cd3f283d5586edac8ec5a7170323c (diff)
downloaditzks-systems-66157930919fbb136e53f4b8ae06e79aaa85c2e8.tar.gz
itzks-systems-66157930919fbb136e53f4b8ae06e79aaa85c2e8.tar.bz2
itzks-systems-66157930919fbb136e53f4b8ae06e79aaa85c2e8.zip
Chromium WPAD configuration: Move to itzks-systems-common (without maintscript magic, bad habbit but ok in this case).
-rw-r--r--debian/control8
-rw-r--r--debian/itzks-systems-common.install1
-rw-r--r--debian/itzks-systems-diskless.install1
-rw-r--r--debian/itzks-systems-mainserver.install1
-rw-r--r--debian/itzks-systems-terminalserver.install1
5 files changed, 9 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index 1f26095..cd5abd5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,17 @@ Architecture: all
Replaces:
itzks-systems-config,
itzks-debian-mate-default-settings,
+ itzks-systems-mainserver (<< 2018.01.03.1~),
+ itzks-systems-workstation (<< 2018.01.03.1~),
+ itzks-systems-terminalserver (<< 2018.01.03.1~),
+ itzks-systems-diskless (<< 2018.01.03.1~),
Breaks:
itzks-systems-config,
itzks-debian-mate-default-settings.
+ itzks-systems-mainserver (<< 2018.01.03.1~),
+ itzks-systems-workstation (<< 2018.01.03.1~),
+ itzks-systems-terminalserver (<< 2018.01.03.1~),
+ itzks-systems-diskless (<< 2018.01.03.1~),
Depends:
${misc:Depends},
iptables,
diff --git a/debian/itzks-systems-common.install b/debian/itzks-systems-common.install
index da3dfbe..e8c35a8 100644
--- a/debian/itzks-systems-common.install
+++ b/debian/itzks-systems-common.install
@@ -1,5 +1,6 @@
bin/passwd usr/bin/
etc/apt/* etc/apt/
+etc/chromium/ etc/
etc/cron.d/itzks-systems-common
etc/debian-edu/* etc/debian-edu/
etc/firefox-esr/* etc/firefox-esr/
diff --git a/debian/itzks-systems-diskless.install b/debian/itzks-systems-diskless.install
index 26b6904..f5b956f 100644
--- a/debian/itzks-systems-diskless.install
+++ b/debian/itzks-systems-diskless.install
@@ -1,7 +1,6 @@
bin/itzks-hosts usr/bin/
bin/itzks-user-suicide usr/bin/
etc/.java etc/
-etc/chromium/ etc/
etc/mimeapps.list etc/
etc/shutdown-at-night/ etc/
sbin/itzks-switch-to-systemd-networkd usr/sbin/
diff --git a/debian/itzks-systems-mainserver.install b/debian/itzks-systems-mainserver.install
index 1f06900..935a56f 100644
--- a/debian/itzks-systems-mainserver.install
+++ b/debian/itzks-systems-mainserver.install
@@ -1,5 +1,4 @@
bin/itzks-hosts usr/bin/
-etc/chromium etc/
etc/cron.d/itzks-transfer-cleaner /etc/cron.d/
etc/skel etc/
etc/sudoers.d/itzks-systems-mainserver etc/sudoers.d/
diff --git a/debian/itzks-systems-terminalserver.install b/debian/itzks-systems-terminalserver.install
index d39787e..e37fd67 100644
--- a/debian/itzks-systems-terminalserver.install
+++ b/debian/itzks-systems-terminalserver.install
@@ -1,5 +1,4 @@
bin/itzks-hosts usr/bin/
etc/.java etc/
-etc/chromium/ etc/
etc/mimeapps.list etc/
etc/shutdown-at-night/ etc/