saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index dcf7963434297a0fdb151313116ef4bbd3ce9947..9df56ee1168c42525f9a430cf1797b159b552148 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -485,6 +485,8 @@ maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list
 maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/nodesource.list'
 maybe chmod 0644 'apt/sources.list.d/nodesource.list.save'
+maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list'
+maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/signal-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/signal-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list'
@@ -494,6 +496,7 @@ maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/xenial-partner.list'
 maybe chmod 0644 'apt/sources.list.d/xenial-partner.list.save'
 maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list'
+maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save'
 maybe chmod 0664 'apt/sources.list.save'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
@@ -501,6 +504,7 @@ maybe chmod 0644 'apt/trusted.gpg.d/bumblebee_ubuntu_stable.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ethereum_ubuntu_ethereum.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/mozillateam_ubuntu_firefox-next.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/webupd8team_ubuntu_java.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/yubico_ubuntu_stable.gpg'
 maybe chmod 0755 'aptdaemon'

diff --git a/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list b/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list
new file mode 100644 (file)
index 0000000..fa6fbfa
--- /dev/null
+++ b/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu xenial main

diff --git a/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save b/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save
new file mode 100644 (file)
index 0000000..fa6fbfa
--- /dev/null
+++ b/apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/privacyidea/privacyidea-dev/ubuntu xenial main

diff --git a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list
index 01fb97a6a6d70678e919fe762b91943ad9bba9cf..36f70497479ab80740dc0638aa773230e4f4d970 100644 (file)
--- a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list
+++ b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list
@@ -1,2 +1,3 @@
 deb http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
 # deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main

diff --git a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
new file mode 100644 (file)
index 0000000..01fb97a
--- /dev/null
+++ b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main

diff --git a/apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg b/apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg
new file mode 100644 (file)
index 0000000..ea44d28
Binary files /dev/null and b/apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg differ

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index c84fbb57b7c6d87249db9d974e99703246d2334b..0c0d5b04a26f83b918e679a5c592d1afa7b733a5 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -25,7 +25,7 @@ Info HP Color LaserJet MFP M277dw
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI socket://192.168.178.254
 State Idle
-StateTime 1533234866
+StateTime 1534174850
 ConfigTime 1496773872
 Type 8425500
 Accepting Yes