From 81429a6325f9b45ef6cbd6a7a2b390ae1c7e8ba6 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 12 Dec 2015 13:08:25 +0100
Subject: [PATCH] Move more executables into config/bin.

---
 setup_opendkim.sh => bin/setup_opendkim.sh | 0
 symlink.sh => bin/symlink.sh               | 0
 jessie_start_server.sh                     | 4 ++--
 jessie_start_thinkpad.sh                   | 4 ++--
 mails/server_postinstall_finished          | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename setup_opendkim.sh => bin/setup_opendkim.sh (100%)
 rename symlink.sh => bin/symlink.sh (100%)

diff --git a/setup_opendkim.sh b/bin/setup_opendkim.sh
similarity index 100%
rename from setup_opendkim.sh
rename to bin/setup_opendkim.sh
diff --git a/symlink.sh b/bin/symlink.sh
similarity index 100%
rename from symlink.sh
rename to bin/symlink.sh
diff --git a/jessie_start_server.sh b/jessie_start_server.sh
index a97bed8..b3e20d2 100755
--- a/jessie_start_server.sh
+++ b/jessie_start_server.sh
@@ -69,14 +69,14 @@ locale-gen
 apt-get -y install ca-certificates
 apt-get -y install git
 git clone http://github.com/plomlompom/config
-config/symlink.sh
+config/bin/symlink.sh
 
 # Add user. Remove old user's config/ if it exists.
 useradd -m -s /bin/bash plom
 rm /home/plom/.bashrc
 rm -rf /home/plom/config
 su - plom -c 'git clone http://github.com/plomlompom/config /home/plom/config'
-su plom -c '/home/plom/config/symlink.sh server'
+su plom -c '/home/plom/config/bin/symlink.sh server'
 
 # Set up editor.
 apt-get -y install vim
diff --git a/jessie_start_thinkpad.sh b/jessie_start_thinkpad.sh
index b0b13ee..3b5a544 100755
--- a/jessie_start_thinkpad.sh
+++ b/jessie_start_thinkpad.sh
@@ -69,13 +69,13 @@ service keyboard-setup restart
 apt-get -y install ca-certificates
 apt-get -y install git
 git clone http://github.com/plomlompom/config
-config/symlink.sh
+config/bin/symlink.sh
 
 # Add user. Remove old user's config/ if it exists.
 useradd -m -s /bin/bash plom
 rm -rf /home/plom/config
 su - plom -c 'git clone http://github.com/plomlompom/config /home/plom/config'
-su plom -c '/home/plom/config/symlink.sh thinkpad'
+su plom -c '/home/plom/config/bin/symlink.sh thinkpad'
 
 # Set up editor.
 apt-get -y install vim
diff --git a/mails/server_postinstall_finished b/mails/server_postinstall_finished
index 9cbd8c2..7e403cc 100644
--- a/mails/server_postinstall_finished
+++ b/mails/server_postinstall_finished
@@ -8,8 +8,8 @@ perform the following tasks:
 
 - ensure the following DNS TXT record for @: v=spf1 mx -all
 
-- run (as root) config/setup_opendkim.sh $selector to set up system for DKIM key
-  signing, with a second parameter $keyfile if a key already exists; without
+- run (as root) config/bin/setup_opendkim.sh $selector to set up system for DKIM
+  key signing, with a second parameter $keyfile if a key already exists; without
   second parameter, this will generate a new key and print the DNS record to add
 
 - in the screen weechat/bitlbee session (run "screen -dr"), switch to the
-- 
2.30.2