From e8d096eec37ff936be83afeb4703a520f205e40f Mon Sep 17 00:00:00 2001 From: Radoslaw Bartosiak Date: Mon, 8 Sep 2014 13:45:22 +0200 Subject: [PATCH] Add creds configuration Configuration is used by cynara_creds_get_[client|user]_method to provide default values of [client|user] feature used in cynara-creds. Change-Id: I9a8b8e0bb009817414b9755523a60edb3d0386d0 Signed-off-by: Radoslaw Bartosiak --- conf/creds.conf | 2 ++ packaging/cynara.spec | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 conf/creds.conf diff --git a/conf/creds.conf b/conf/creds.conf new file mode 100644 index 0000000..10bce6b --- /dev/null +++ b/conf/creds.conf @@ -0,0 +1,2 @@ +client_default=smack +user_default=uid diff --git a/packaging/cynara.spec b/packaging/cynara.spec index 4d067c3..ffcccfb 100644 --- a/packaging/cynara.spec +++ b/packaging/cynara.spec @@ -31,7 +31,8 @@ BuildRequires: pkgconfig(libsystemd-journal) %global group_name %{name} %global state_path %{_localstatedir}/%{name}/ -%global tests_dir %{_datarootdir}/%{name}/tests +%global tests_dir %{_datarootdir}/%{name}/tests/ +%global conf_path %{_sysconfdir}/%{name}/ %if !%{defined build_type} %define build_type RELEASE @@ -218,7 +219,6 @@ BuildRequires: pkgconfig(gmock) Cynara tests ####################################################### - %package -n cynara-devel Summary: Cynara service (devel) Requires: cynara = %{version}-%{release} @@ -252,7 +252,8 @@ export CXXFLAGS="$CXXFLAGS -Wp,-U_FORTIFY_SOURCE" %endif export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"%{state_path}\\\" \ - -DCYNARA_TESTS_DIR=\\\"%{tests_dir}\\\"" + -DCYNARA_TESTS_DIR=\\\"%{tests_dir}\\\" \ + -DCYNARA_CONFIGURATION_DIR=\\\"%{conf_path}\\\"" export LDFLAGS+="-Wl,--rpath=%{_libdir}" %cmake . \ @@ -262,10 +263,12 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir}" make %{?jobs:-j%jobs} %install - rm -rf %{buildroot} %make_install +mkdir -p %{buildroot}/%{conf_path} +cp ./conf/creds.conf %{buildroot}/%{conf_path}/creds.conf + mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants mkdir -p %{buildroot}/%{state_path} mkdir -p %{buildroot}/%{tests_dir} @@ -476,6 +479,7 @@ fi %manifest libcynara-creds-commons.manifest %license LICENSE %{_libdir}/libcynara-creds-commons.so.* +%{conf_path}creds.conf %files -n libcynara-creds-commons-devel %{_includedir}/cynara/cynara-creds-commons.h -- 2.7.4