From 122efd0cf07a794da6468c7ab445dee382e4e346 Mon Sep 17 00:00:00 2001
From: Hinrikus Wolf <hinrikus@fsmpi.rwth-aachen.de>
Date: Sun, 21 May 2017 00:40:57 +0200
Subject: [PATCH] clean up
---
nfs-server/files/auto.master | 24 ------------------------
nfs-server/files/modprobe-nfs.conf | 1 -
nfs-server/{ => files}/nfs-common | 0
nfs-server/{ => files}/nfs-kernel-server | 0
nfs-server/templates/auto.nfs.j2 | 3 ---
5 files changed, 28 deletions(-)
delete mode 100644 nfs-server/files/auto.master
delete mode 100644 nfs-server/files/modprobe-nfs.conf
rename nfs-server/{ => files}/nfs-common (100%)
rename nfs-server/{ => files}/nfs-kernel-server (100%)
delete mode 100644 nfs-server/templates/auto.nfs.j2
diff --git a/nfs-server/files/auto.master b/nfs-server/files/auto.master
deleted file mode 100644
index aef7888..0000000
--- a/nfs-server/files/auto.master
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Sample auto.master file
-# This is an automounter map and it has the following format
-# key [ -mount-options-separated-by-comma ] location
-# For details of the format look at autofs(5).
-#
-#/misc /etc/auto.misc
-#
-# NOTE: mounts done from a hosts map will be mounted with the
-# "nosuid" and "nodev" options unless the "suid" and "dev"
-# options are explicitly given.
-#
-#/net -hosts
-/net /etc/auto.nfs
-#
-# Include central master map if it can be found using
-# nsswitch sources.
-#
-# Note that if there are entries for /net or /misc (as
-# above) in the included master map any keys that are the
-# same will not be seen as the first read key seen takes
-# precedence.
-#
-+auto.master
diff --git a/nfs-server/files/modprobe-nfs.conf b/nfs-server/files/modprobe-nfs.conf
deleted file mode 100644
index 2f7e4b4..0000000
--- a/nfs-server/files/modprobe-nfs.conf
+++ /dev/null
@@ -1 +0,0 @@
-options nfs nfs4_disable_idmapping=N
diff --git a/nfs-server/nfs-common b/nfs-server/files/nfs-common
similarity index 100%
rename from nfs-server/nfs-common
rename to nfs-server/files/nfs-common
diff --git a/nfs-server/nfs-kernel-server b/nfs-server/files/nfs-kernel-server
similarity index 100%
rename from nfs-server/nfs-kernel-server
rename to nfs-server/files/nfs-kernel-server
diff --git a/nfs-server/templates/auto.nfs.j2 b/nfs-server/templates/auto.nfs.j2
deleted file mode 100644
index f60b42f..0000000
--- a/nfs-server/templates/auto.nfs.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{%- for share in nfs_shares %}
-{{ share.netdir }} -{{ share.options }} {{ share.src }}
-{% endfor -%}
--
GitLab