Improve default configuration.

Install by default working nfs configuration.
For RPM also install by default file to configure interposer plugin.

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Günther Deschner <gdeschner@redhat.com>

5 files changed, 15 insertions, 19 deletions

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 05f64af..c814ab8 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -200,7 +200,6 @@ interposetest_LDADD = \
     $(GSS_PROXY_LIBS)
 
 dist_noinst_DATA += \
-    examples/gssproxy-example.conf \
     m4
 
 noinst_PROGRAMS = cli_srv_comm interposetest
diff --git a/proxy/configure.ac b/proxy/configure.ac
index f605b65..a565b24 100644
--- a/proxy/configure.ac
+++ b/proxy/configure.ac
@@ -178,5 +178,5 @@ AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the bu
 AC_SUBST([abs_builddir], $abs_build_dir)
 
 AC_CONFIG_FILES([Makefile systemd/gssproxy.service man/Makefile
-                 contrib/gssproxy.spec examples/mech])
+                 contrib/gssproxy.spec examples/mech examples/gssproxy.conf])
 AC_OUTPUT
diff --git a/proxy/contrib/gssproxy.spec.in b/proxy/contrib/gssproxy.spec.in
index 7ba0f14..af858ab 100644
--- a/proxy/contrib/gssproxy.spec.in
+++ b/proxy/contrib/gssproxy.spec.in
@@ -68,7 +68,8 @@ make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/gssproxy/proxymech.la
 install -d -m755 %{buildroot}%{_sysconfdir}/gssproxy
 install -d -m755 %{buildroot}%{_unitdir}
-install -m644 examples/gssproxy-example.conf %{buildroot}%{_sysconfdir}/gssproxy/gssproxy.conf
+install -m644 examples/gssproxy.conf %{buildroot}%{_sysconfdir}/gssproxy/gssproxy.conf
+install -m644 examples/mech %{buildroot}%{_sysconfdir}/gss/mech
 install -m644 systemd/gssproxy.service %{buildroot}%{_unitdir}/gssproxy.service
 
 %clean
@@ -83,6 +84,7 @@ rm -rf %{buildroot}
 %attr(700,root,root) %dir %{gpstatedir}
 %attr(700,root,root) %dir %{gpstatedir}/clients
 %attr(0600,root,root) %config(noreplace) /%{_sysconfdir}/gssproxy/gssproxy.conf
+%attr(0644,root,root) %config(noreplace) /%{_sysconfdir}/gss/mech
 %{_libdir}/gssproxy/proxymech.so
 %{_mandir}/man5/gssproxy.conf.5*
 %{_mandir}/man8/gssproxy.8*
diff --git a/proxy/examples/gssproxy-example.conf b/proxy/examples/gssproxy-example.conf
deleted file mode 100644
index 139d6e6..0000000
--- a/proxy/examples/gssproxy-example.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[gssproxy]
-
-[service/default]
-  mechs = krb5
-  krb5_keytab = /etc/krb5.keytab
-  krb5_ccache = /run/user/%u/krb5cc
-  trusted = yes
-  kernel_nfsd = yes
-  euid = 0
-
-[service/gssproxy]
-  mechs = krb5
-  krb5_principal = gssproxy/foo.bar.org
-  krb5_keytab = /etc/gssproxy/gssproxy.keytab
-  krb5_ccache = /tmp/krb5cc_123
-  euid = 123
diff --git a/proxy/examples/gssproxy.conf.in b/proxy/examples/gssproxy.conf.in
new file mode 100644
index 0000000..7343806
--- /dev/null
+++ b/proxy/examples/gssproxy.conf.in
@@ -0,0 +1,11 @@
+[gssproxy]
+
+[service/nfs]
+  mechs = krb5
+  cred_store = keytab:/etc/krb5.keytab
+  cred_store = ccache:FILE:@gpclidir@/krb5cc_%U
+  cred_store = client_keytab:@gpclidir@/%U.keytab
+  trusted = yes
+  kernel_nfsd = yes
+  euid = 0
+