saving uncommitted changes in /etc prior to apt run

diff --git a/apcupsd/apcupsd.conf b/apcupsd/apcupsd.conf
index 76861e07cc343ea5030a70bd91c4e3d739889001..b3ca5db8e0711d32ead7287854e15212a8c3131f 100644 (file)
--- a/apcupsd/apcupsd.conf
+++ b/apcupsd/apcupsd.conf
@@ -87,7 +87,7 @@ UPSCABLE usb
 #                            (helpful if you have more than one USB UPS).
 #
 UPSTYPE usb
-DEVICE /dev/ttyS0
+#DEVICE /dev/ttyS0
 
 # POLLTIME <int>
 #   Interval (in seconds) at which apcupsd polls the UPS for status. This

diff --git a/cups/printers.conf b/cups/printers.conf
index 175ec61c8e92a3a42e64f6d814a6f4e8ba50ef49..611ff9cbabbcaabdc4cbdae17dc7a3936e819b6f 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -2,14 +2,14 @@
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-UUID urn:uuid:c6d611f7-6924-3e23-6bb3-a623d0cae267
+UUID urn:uuid:00668a8c-4322-379c-5df4-899d9b97c44f
 Info 
 Location 
 MakeModel Color LaserJet MFP M277dw
 DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 State Idle
-StateTime 1540355763
-ConfigTime 1540355777
+StateTime 1540418779
+ConfigTime 1540418784
 Type 4188
 Accepting Yes
 Shared No

diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml
index 1d4e8a279bba88539185fab6a76ab148b65003fb..364fa6e2547982b57fd7c1c9f34df91c78607a1a 100644 (file)
--- a/loolwsd/loolwsd.xml
+++ b/loolwsd/loolwsd.xml
@@ -56,7 +56,7 @@
                </outgoing>
        </trace>
        <net desc="Network settings">
-               <proto default="all" desc="Protocol to use IPv4, IPv6 or all for both" type="string">IPv4</proto>
+               <proto default="all" desc="Protocol to use IPv4, IPv6 or all for both" type="string">all</proto>
                <listen default="any" desc="Listen address that loolwsd binds to. Can be 'any' or 'loopback'." type="string">any</listen>
                <service_root default="" desc="Prefix all the pages, websockets, etc. with this path." type="path"/>
                <post_allow allow="true" desc="Allow/deny client IP address for POST(REST).">
@@ -91,6 +91,7 @@
                <wopi allow="true" desc="Allow/deny wopi storage. Mutually exclusive with webdav.">
                        <host allow="true" desc="Regex pattern of hostname to allow or deny.">localhost</host>
                        <host allow="true" desc="Regex pattern of hostname to allow or deny.">nextcloud\.moellein\.homeip\.net</host>
+                       <host allow="true" desc="Regex pattern of hostname to allow or deny.">collabora\.moellein\.homeip\.net</host>
                        <host allow="true" desc="Regex pattern of hostname to allow or deny.">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
                        <host allow="true" desc="Regex pattern of hostname to allow or deny.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
                        <host allow="true" desc="Regex pattern of hostname to allow or deny.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>