committing changes in /etc after apt run

author mhoellein <mhoellein@freenet.de>

Wed, 12 Dec 2018 09:49:40 +0000 (10:49 +0100)

committer mhoellein <mhoellein@freenet.de>

Wed, 12 Dec 2018 09:49:40 +0000 (10:49 +0100)
author mhoellein <mhoellein@freenet.de>
Wed, 12 Dec 2018 09:49:40 +0000 (10:49 +0100)
committer mhoellein <mhoellein@freenet.de>
Wed, 12 Dec 2018 09:49:40 +0000 (10:49 +0100)
diff --git a/.etckeeper b/.etckeeper

index acad1e05a74bdd55839cd436f09ac0819f49bbc8..b55eda9b8edf85fd025edd7008526158a14c0e28 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -763,6 +763,7 @@ maybe chmod 0644 'apt/trusted.gpg'
  maybe chmod 0755 'apt/trusted.gpg.d'
  maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg'
  maybe chmod 0755 'arpwatch'
  maybe chmod 0644 'arpwatch/README'
  maybe chown 'asterisk' 'asterisk'
diff --git a/apache2/conf-available/loolwsd.conf b/apache2/conf-available/loolwsd.conf

index 10b66b47fa62266c81c024d7fd65ad64405a852c..7ccfe005147b46e1238cab5fdb74c21e5fe8bce7 100644 (file)
--- a/apache2/conf-available/loolwsd.conf
+++ b/apache2/conf-available/loolwsd.conf
@@ -20,6 +20,10 @@
    ProxyPass           /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0
    ProxyPassReverse    /hosting/discovery http://127.0.0.1:9980/hosting/discovery
  
+  # Capabilities
+  ProxyPass           /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0
+  ProxyPassReverse    /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities
+
    # Main websocket
    ProxyPassMatch "/lool/(.*)/ws$" ws://127.0.0.1:9980/lool/$1/ws nocanon
  
diff --git a/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg b/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg

new file mode 100644 (file)

index 0000000..1cc9f3f

Binary files /dev/null and b/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg differ
diff --git a/chromium-browser/customizations/10-flash b/chromium-browser/customizations/10-flash

index d812ca95e158035c73501a85692ee70d1f1eab93..5d67921834750220bbc797e1431ba9a1bd89bcb7 100644 (file)
--- a/chromium-browser/customizations/10-flash
+++ b/chromium-browser/customizations/10-flash
@@ -1,6 +1,6 @@
  flashso="/usr/lib/adobe-flashplugin/libpepflashplayer.so"
  if test -f "$flashso"; then
-       CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$flashso --ppapi-flash-version=31.0.0.153"
+       CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ppapi-flash-path=$flashso --ppapi-flash-version=32.0.0.101"
         echo "Using PPAPI flash."
  else
         echo "PPAPI flash has config file in /etc, but library does not exist and won't be used. Package is uninstalled, not purged."
diff --git a/cups/printers.conf b/cups/printers.conf

index aa4907b4af48326e73279b72b459fad9dfcb52c1..638c4b2ca013e3d921d8418662cc72a64e5724df 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -20,14 +20,14 @@ OpPolicy default
  ErrorPolicy retry-job
  </Printer>
  <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local>
-UUID urn:uuid:8660d1e8-c0e2-31e6-533e-20e8f2b4f883
+UUID urn:uuid:7b0aa7bf-b984-39e9-722c-6b689f5387e2
  Info 
  Location 
  MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
  DeviceURI ipps://NPI9D0E59.local:443/ipp/print
  State Idle
-StateTime 1544569812
-ConfigTime 1544569812
+StateTime 1544608051
+ConfigTime 1544608051
  Type 8425564
  Accepting Yes
  Shared No
diff --git a/java-8-openjdk/security/java.security b/java-8-openjdk/security/java.security

index 1e62d676fd8b74da525541fcd0a74512956c94cb..8ca028835e989b9cd4b19811b36777ec03d06249 100644 (file)
--- a/java-8-openjdk/security/java.security
+++ b/java-8-openjdk/security/java.security
@@ -620,8 +620,8 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024
  #
  # Example:
  #   jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
-jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \
-    EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC
+jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \
+    EC keySize < 224, 3DES_EDE_CBC
  
  # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS)
  # processing in JSSE implementation.
diff --git a/nginx/snippets/loolwsd.conf b/nginx/snippets/loolwsd.conf

index f55f8829b44753ab566c8b6bf1b49439497dfb38..e176760b951b3576635b49fac8894ce9c5ba7dce 100644 (file)
--- a/nginx/snippets/loolwsd.conf
+++ b/nginx/snippets/loolwsd.conf
@@ -10,6 +10,12 @@
          proxy_set_header Host $http_host;
      }
  
+    # Capabilities
+    location ^~ /hosting/capabilities {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Host $http_host;
+    }
+
      # main websocket
      location ~ ^/lool/(.*)/ws$ {
          proxy_pass http://localhost:9980;
author	mhoellein <mhoellein@freenet.de>
	Wed, 12 Dec 2018 09:49:40 +0000 (10:49 +0100)
committer	mhoellein <mhoellein@freenet.de>
	Wed, 12 Dec 2018 09:49:40 +0000 (10:49 +0100)
.etckeeper		patch \| blob \| history
apache2/conf-available/loolwsd.conf		patch \| blob \| history
apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg	[new file with mode: 0644]	patch \| blob
chromium-browser/customizations/10-flash		patch \| blob \| history
cups/printers.conf		patch \| blob \| history
java-8-openjdk/security/java.security		patch \| blob \| history
nginx/snippets/loolwsd.conf		patch \| blob \| history