saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 3cc1d73d06aa098852f751e1cceecf314bf57959..779d1c380cf4c1bda731e09dfa65b57e04b133ed 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -25,7 +25,6 @@ mkdir -p './network/if-pre-up.d'
 mkdir -p './network/interfaces.d'
 mkdir -p './opt'
 mkdir -p './perl/CPAN'
-mkdir -p './salt/minion.d'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './ssl/private'
@@ -601,6 +600,7 @@ maybe chmod 0644 's-nail.rc'
 maybe chmod 0755 'salt'
 maybe chmod 0644 'salt/minion'
 maybe chmod 0755 'salt/minion.d'
+maybe chmod 0644 'salt/minion.d/my-minion.conf'
 maybe chmod 0644 'salt/minion_id'
 maybe chmod 0755 'salt/pki'
 maybe chmod 0700 'salt/pki/minion'

diff --git a/salt/minion b/salt/minion
index 47ecb287e82c94b027cf7bd36b3d4dc7ecea9ec4..9bc9408defc99a3eeebba3e82788402d10ffa2c0 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -14,7 +14,6 @@
 # Set the location of the salt master server. If the master server cannot be
 # resolved, then the minion will fail to start.
 #master: salt
-master: salt.uhu-banane.de
 
 # Set http proxy information for the minion when doing requests
 #proxy_host:

diff --git a/salt/minion.d/my-minion.conf b/salt/minion.d/my-minion.conf
new file mode 100644 (file)
index 0000000..38a7968
--- /dev/null
+++ b/salt/minion.d/my-minion.conf
@@ -0,0 +1 @@
+master: salt.uhu-banane.de