From d693bf5f901d3b8e248a800d2ae0a4660167788a Mon Sep 17 00:00:00 2001
From: Dennis Camera <dennis.camera@ssrq-sds-fds.ch>
Date: Mon, 28 Sep 2020 16:34:12 +0200
Subject: [PATCH] Move auth_conf explorer from __dma_auth to __dma

---
 type/__dma/explorer/auth_conf      | 50 +++++++++++++++++++++++++++++-
 type/__dma_auth/explorer/auth_conf | 50 +-----------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)
 mode change 120000 => 100755 type/__dma/explorer/auth_conf
 mode change 100755 => 120000 type/__dma_auth/explorer/auth_conf

diff --git a/type/__dma/explorer/auth_conf b/type/__dma/explorer/auth_conf
deleted file mode 120000
index db038ae..0000000
--- a/type/__dma/explorer/auth_conf
+++ /dev/null
@@ -1 +0,0 @@
-../../__dma_auth/explorer/auth_conf
\ No newline at end of file
diff --git a/type/__dma/explorer/auth_conf b/type/__dma/explorer/auth_conf
new file mode 100755
index 0000000..cef0aca
--- /dev/null
+++ b/type/__dma/explorer/auth_conf
@@ -0,0 +1,49 @@
+#!/bin/sh -e
+#
+# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# This explorer determines the path of dma's auth.conf file
+
+# No dma.conf -> use default
+test -f /etc/dma/dma.conf || {
+	echo /etc/dma/auth.conf
+	exit 0
+}
+test -r /etc/dma/dma.conf || {
+	echo 'Cannot read /etc/dma/dma.conf' >&2
+	exit 1
+}
+
+# Get AUTHPATH from dma.conf
+awk -F'[ \t]' '
+{
+	sub(/#.*$/, "", $0)  # remove comments
+	if (!$0) next  # ignore empty lines
+}
+$1 == "AUTHPATH" {
+	# Store authpath. In dma conf parsing last wins.
+	if ($2) authpath = substr($0, index($0, " ") + 1)
+}
+END {
+	if (authpath) {
+		print authpath
+		exit 0
+	} else exit 1
+}
+' /etc/dma/dma.conf \
+|| echo /etc/dma/auth.conf  # default
diff --git a/type/__dma_auth/explorer/auth_conf b/type/__dma_auth/explorer/auth_conf
deleted file mode 100755
index cef0aca..0000000
--- a/type/__dma_auth/explorer/auth_conf
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-#
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-# This explorer determines the path of dma's auth.conf file
-
-# No dma.conf -> use default
-test -f /etc/dma/dma.conf || {
-	echo /etc/dma/auth.conf
-	exit 0
-}
-test -r /etc/dma/dma.conf || {
-	echo 'Cannot read /etc/dma/dma.conf' >&2
-	exit 1
-}
-
-# Get AUTHPATH from dma.conf
-awk -F'[ \t]' '
-{
-	sub(/#.*$/, "", $0)  # remove comments
-	if (!$0) next  # ignore empty lines
-}
-$1 == "AUTHPATH" {
-	# Store authpath. In dma conf parsing last wins.
-	if ($2) authpath = substr($0, index($0, " ") + 1)
-}
-END {
-	if (authpath) {
-		print authpath
-		exit 0
-	} else exit 1
-}
-' /etc/dma/dma.conf \
-|| echo /etc/dma/auth.conf  # default
diff --git a/type/__dma_auth/explorer/auth_conf b/type/__dma_auth/explorer/auth_conf
new file mode 120000
index 0000000..e89de93
--- /dev/null
+++ b/type/__dma_auth/explorer/auth_conf
@@ -0,0 +1 @@
+../../__dma/explorer/auth_conf
\ No newline at end of file