committing changes in /etc after apt run

author Frank Brehm <frank@brehm-online.com>

Fri, 16 Mar 2018 16:00:20 +0000 (17:00 +0100)

committer Frank Brehm <frank@brehm-online.com>

Fri, 16 Mar 2018 16:00:20 +0000 (17:00 +0100)
author Frank Brehm <frank@brehm-online.com>
Fri, 16 Mar 2018 16:00:20 +0000 (17:00 +0100)
committer Frank Brehm <frank@brehm-online.com>
Fri, 16 Mar 2018 16:00:20 +0000 (17:00 +0100)
diff --git a/.etckeeper b/.etckeeper

index 4a7527efc6e2817047445257727c0bd510a3ae77..e127a0e4c84b888f1794a888b4501d4671d745a7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -36,6 +36,7 @@ mkdir -p './polkit-1/localauthority/90-mandatory.d'
  mkdir -p './ppp/ipv6-down.d'
  mkdir -p './ppp/ipv6-up.d'
  mkdir -p './salt/minion.d'
+mkdir -p './salt/pki'
  mkdir -p './security/limits.d'
  mkdir -p './security/namespace.d'
  mkdir -p './ssl/private'
@@ -587,10 +588,6 @@ maybe chmod 0644 'salt/minion'
  maybe chmod 0755 'salt/minion.d'
  maybe chmod 0644 'salt/minion_id'
  maybe chmod 0755 'salt/pki'
-maybe chmod 0700 'salt/pki/minion'
-maybe chmod 0400 'salt/pki/minion/minion.pem'
-maybe chmod 0644 'salt/pki/minion/minion.pub'
-maybe chmod 0644 'salt/pki/minion/minion_master.pub'
  maybe chmod 0644 'securetty'
  maybe chmod 0755 'security'
  maybe chmod 0644 'security/access.conf'
diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove

index 3609ca49c13fd289580e92667e4ec0945a898d09..7031df5578f10fa5229c112cce6ad104449d3b93 100644 (file)
--- a/apt/apt.conf.d/01autoremove
+++ b/apt/apt.conf.d/01autoremove
@@ -24,6 +24,7 @@ APT
         "linux-backports-modules-.*";
          # tools
          "linux-tools";
+        "linux-cloud-tools";
    };
  
    Never-MarkAuto-Sections
diff --git a/dbus-1/system.d/org.freedesktop.ModemManager1.conf b/dbus-1/system.d/org.freedesktop.ModemManager1.conf

index 72815d78fbe1aefabce0f6d84183ab9e6b03c910..e5e5d12849be1540fa5921b8529711012f42683f 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.ModemManager1.conf
+++ b/dbus-1/system.d/org.freedesktop.ModemManager1.conf
@@ -161,6 +161,14 @@
             send_interface="org.freedesktop.ModemManager1.Modem.Location"
             send_member="Setup"/>
  
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Location"
+           send_member="SetSuplServer"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Location"
+           send_member="SetGpsRefreshRate"/>
+
      <!-- Protected by the Location policy rule -->
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem.Location"
diff --git a/locale.alias b/locale.alias

index 13f49d1d7e7caba57b0b09b5ecb306853bcb0774..2b286dd04fdb5db429fbc5b6843e89c70eb9f633 100644 (file)
--- a/locale.alias
+++ b/locale.alias
@@ -1,5 +1,5 @@
  # Locale name alias data base.
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
diff --git a/locale.gen b/locale.gen

index 6972db4dbe5fa218587b7c42bb94f42919f40208..473db777139bf90ccbe4805d7dd982402457246e 100644 (file)
--- a/locale.gen
+++ b/locale.gen
@@ -506,3 +506,12 @@ vi_VN UTF-8
  # sm_WS UTF-8
  # to_TO UTF-8
  # tpi_PG UTF-8
+# bho_NP UTF-8
+# ca_ES@valencia UTF-8
+# en_SC.UTF-8 UTF-8
+# kab_DZ UTF-8
+# mfe_MU UTF-8
+# miq_NI UTF-8
+# mjw_IN UTF-8
+# shn_MM UTF-8
+# yuw_PG UTF-8
diff --git a/salt/minion b/salt/minion

index ed2cfde7dc6b7065d2a37e6397ab65359ce798bb..7420713f96a38ba6c43e8fcf25202400aee7bef6 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -165,7 +165,7 @@
  # strip_colors: False
  
  # Backup files that are replaced by file.managed and file.recurse under
-# 'cachedir'/file_backups relative to their original location and appended
+# 'cachedir'/file_backup relative to their original location and appended
  # with a timestamp. The only valid setting is "minion". Disabled by default.
  #
  # Alternatively this can be specified for each file in state files:
@@ -235,13 +235,13 @@
  # cause sub minion process to restart.
  #auth_safemode: False
  
-# Ping Master to ensure connection is alive (seconds).
+# Ping Master to ensure connection is alive (minutes).
  #ping_interval: 0
  
  # To auto recover minions if master changes IP address (DDNS)
  #    auth_tries: 10
  #    auth_safemode: False
-#    ping_interval: 90
+#    ping_interval: 2
  #
  # Minions won't know master is missing until a ping fails. After the ping fail,
  # the minion will attempt authentication and likely fails out and cause a restart.
@@ -373,7 +373,7 @@
  #    interface: eth0
  #    cidr: '10.0.0.0/8'
  
-# The number of seconds a mine update runs.
+# The number of minutes between mine updates.
  #mine_interval: 60
  
  # Windows platforms lack posix IPC and must rely on slower TCP based inter-
@@ -500,6 +500,11 @@
  # as the environment setting, but for pillar instead of states.
  #pillarenv: None
  #
+# Set this option to True to force the pillarenv to be the same as the
+# effective saltenv when running states. Note that if pillarenv is specified,
+# this option will be ignored.
+#pillarenv_from_saltenv: False
+#
  # Set this option to 'True' to force a 'KeyError' to be raised whenever an
  # attempt to retrieve a named value from pillar fails. When this option is set
  # to 'False', the failed attempt returns an empty string. Default is 'False'.
diff --git a/salt/pki/minion/minion.pem b/salt/pki/minion/minion.pem

deleted file mode 100644 (file)

index c89230c..0000000
--- a/salt/pki/minion/minion.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAr8zWcEGatinJZCsr4XItDLipj8j5K3wEaXhFQjrZTRGsl5+K
-MjmC5vXcILQWomjYCNAddr7eHKMnkLaQVgJxx/gJLn/U7mUXkgW6hMoUSFMZdSpG
-3tjD1Q72J2xxZiV3C6DFY7C4Oxq/yx6zt7ELwmVqOQ/tMZAK0zSjFzXJRvGE3Bqy
-uKGsiFOb0NWQoJzh8SHsSi/6VrD8iOHGEHlO4GXZWa1IVqFJBSwSCWD9sBZ3ZAGB
-qRAMIZPdh4Vlueb3/SApPE8db59k/OUej/IDV+kqtP9+Y3mn/9Zu8F4g5aKyQPcN
-D3dA1LFinSX2oRF2oV801h7veX0YnYDjidL/DQIDAQABAoIBAEQKXrCh45Q/hg+7
-2cbu3tq+mfnpie63mCmOABhLGJGIlqk0eVNJCQ4E+Ea8DMqdE4gNrGmqI+Mnjoem
-8SQo3ArOSBd0KGCAReghSXhdkg4QA5liXH2hneHXYZQOl7E2LOYWOm+EFTni93pR
-DrO41VlO0Rb2wBHfsyDdjYXNLnLDIOOZCyaJvlgRfsWHhxt079ytUbwFKTxMZVRh
-EPc3qwQA9rduWZeXK9RwXn60bkEnTBqjy5J0W1r6yCWB6rJ5yE3uMev7JszK0NZx
-QPmuUu0Du2Z61J52DkZTSaC9z2QPwMfrovhXxvtFPx1fZ8Am96TfMPr5P1WeF/Ix
-VwHgMwECgYEAxzfsIMUiAk19AGrcHei9pPvcvM+XzvOJbk67cYHSdl9qrBidBzqx
-1P7LABv7f9vvzGzjuDLqMMVRTeiV+rtjUWK4Tdry58/gQrZ/L9/DdteJwQNIDCN3
-7cmM08KCtUfoXWKQknOz0mmZtFMS0ri/lbzSfsHUnya8LEyil6eRT0ECgYEA4egv
-1ZDnmajcIRsA0cVdjfIEwoum7B85gQnP4h+6Jo234b9ATiEVwrs3nC+N9A7lECJ3
-HWZIb6sfYHR5jc9TiAFQvHb6V+EHnOh8M9+8QOoJPNcgsQDPU87nIfdVC6gSRTVQ
-YIyoQjZJFJefFWs+l+9FC3tIkItMY0E99m1ciM0CgYA2aksAJHiGon3LWGTpcoIi
-h30iwZ1YtOLME4tVlL1VAfkUKuDxcZHTeQkf7YTDxuJ4NyH4VUfsrGjp2+bjhr25
-JDrtYSnKMdiywEB7ZiZw1qzU4L2UOzft5oil6tJjC9Ind92/cwUiKyAFxk806avD
-DcF9SBp4ok7x1rjuraGeQQKBgQCPojZPvrtSuseDkQy7U5bBOqEGJQ7z0IKaZee0
-KWINQ0woD5bOVkDkuG6KMr458AJ6eL9thOwHfDEN/eCPZsQAlH2F5swTdfOGM1dN
-EDM8vtEyysFxaUdpTQMuWHjNWYaMVHKPgL82ohdjLWgrkS2SIsKuoysnJDpkXUYN
-Wclc/QKBgFpSH3zzrP8A4vPmgVkly0iPvUjslLnTfLioVPVTk1Zj5Lj5RQA82Mjs
-uiyh68U/pC5Jl38NJ+d6sAeovh7Ax48ZeWIVAAxWM72RluUdXyfqxaQ0JWaJMdqt
-m46Pn8dv8L/xkhQ4Db9LEXyYTVt4X0pTBBk3xFLCrOeB+UYY+toN
------END RSA PRIVATE KEY-----
-\ No newline at end of file
diff --git a/salt/pki/minion/minion.pub b/salt/pki/minion/minion.pub

deleted file mode 100644 (file)

index 8012e23..0000000
--- a/salt/pki/minion/minion.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr8zWcEGatinJZCsr4XIt
-DLipj8j5K3wEaXhFQjrZTRGsl5+KMjmC5vXcILQWomjYCNAddr7eHKMnkLaQVgJx
-x/gJLn/U7mUXkgW6hMoUSFMZdSpG3tjD1Q72J2xxZiV3C6DFY7C4Oxq/yx6zt7EL
-wmVqOQ/tMZAK0zSjFzXJRvGE3BqyuKGsiFOb0NWQoJzh8SHsSi/6VrD8iOHGEHlO
-4GXZWa1IVqFJBSwSCWD9sBZ3ZAGBqRAMIZPdh4Vlueb3/SApPE8db59k/OUej/ID
-V+kqtP9+Y3mn/9Zu8F4g5aKyQPcND3dA1LFinSX2oRF2oV801h7veX0YnYDjidL/
-DQIDAQAB
------END PUBLIC KEY-----
-\ No newline at end of file
diff --git a/salt/pki/minion/minion_master.pub b/salt/pki/minion/minion_master.pub

deleted file mode 100644 (file)

index b677f0b..0000000
--- a/salt/pki/minion/minion_master.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwUbxQYMDoCPQTWHREbbu
-lTBJ+BNLjeUalhTgXjaR7uNiGryiOoLGtSiQFwiYClJ/7QqUoSG7A9c5Xw1Qv6CI
-H73sBAdniAFaC9jeY+4Pe22QlrIuE9AoWGNw9X2gDQ1/9MHGaFnlumDW5pLNvP+i
-nd3DRVNuhSR+S0/sTJUbFpzXXIzN0WijIBLA+oqlR/ANPc89Y+XhXUaVje48yW0l
-oEiedhRzHPGS5mGwyDs9MqLano1LeRdu4kdyhboljqX3c/SsVgc/Q3oD42+XerI1
-rz+mkLBNzHhNQWn6k6W8PdiYTnRXH6WUyMMxniBR/5QPWx3Owu5aeSy23Dhl6SRc
-EQIDAQAB
------END PUBLIC KEY-----
-\ No newline at end of file
diff --git a/systemd/logind.conf b/systemd/logind.conf

index e03fbd9ed4b7a072da95312864e534e6980a6fd7..d3fcf8f31e57f29579d3e029a251c6c2e30473d4 100644 (file)
--- a/systemd/logind.conf
+++ b/systemd/logind.conf
@@ -22,6 +22,7 @@
  #HandleSuspendKey=suspend
  #HandleHibernateKey=hibernate
  #HandleLidSwitch=suspend
+#HandleLidSwitchExternalPower=suspend
  #HandleLidSwitchDocked=ignore
  #PowerKeyIgnoreInhibited=no
  #SuspendKeyIgnoreInhibited=no
diff --git a/systemd/system.conf b/systemd/system.conf

index fae7cab88c8b346ac33ab1e26162c785170d9738..fd0c62779a4aff2d38a1e24ddbb7a698f2f48298 100644 (file)
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -42,7 +42,7 @@
  #DefaultIOAccounting=no
  #DefaultIPAccounting=no
  #DefaultBlockIOAccounting=no
-#DefaultMemoryAccounting=no
+#DefaultMemoryAccounting=yes
  #DefaultTasksAccounting=yes
  #DefaultTasksMax=
  #DefaultLimitCPU=
diff --git a/udev/udev.conf b/udev/udev.conf

index b7a42ab83363c4694ae9231e6109720009ef1777..0d812d4a6565309658874c8745f22975f5d0ada6 100644 (file)
--- a/udev/udev.conf
+++ b/udev/udev.conf
@@ -1,6 +1,6 @@
  # see udev.conf(5) for details
  #
-# udevd is started in the initramfs, so when this file is modified the
-# initramfs should be rebuilt.
+# udevd is also started in the initrd.  When this file is modified you might
+# also want to rebuild the initrd, so that it will include the modified configuration.
  
  #udev_log="info"
author	Frank Brehm <frank@brehm-online.com>
	Fri, 16 Mar 2018 16:00:20 +0000 (17:00 +0100)
committer	Frank Brehm <frank@brehm-online.com>
	Fri, 16 Mar 2018 16:00:20 +0000 (17:00 +0100)
.etckeeper		patch \| blob \| history
apt/apt.conf.d/01autoremove		patch \| blob \| history
dbus-1/system.d/org.freedesktop.ModemManager1.conf		patch \| blob \| history
locale.alias		patch \| blob \| history
locale.gen		patch \| blob \| history
salt/minion		patch \| blob \| history
salt/pki/minion/minion.pem	[deleted file]	patch \| blob \| history
salt/pki/minion/minion.pub	[deleted file]	patch \| blob \| history
salt/pki/minion/minion_master.pub	[deleted file]	patch \| blob \| history
systemd/logind.conf		patch \| blob \| history
systemd/system.conf		patch \| blob \| history
udev/udev.conf		patch \| blob \| history