summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2015-04-14 15:43:34 -0400
committerRob Crittenden <rcritten@redhat.com>2015-04-15 13:57:42 -0400
commiteaaffe854977912f9a4c0cc477197bd8ba96230f (patch)
treeb59c7f01f7eca053b532c1960a81b4280203300d
parentaad99a647d73820df1694848824d341f14baae4e (diff)
downloadipsilon-eaaffe854977912f9a4c0cc477197bd8ba96230f.zip
ipsilon-eaaffe854977912f9a4c0cc477197bd8ba96230f.tar.gz
ipsilon-eaaffe854977912f9a4c0cc477197bd8ba96230f.tar.xz
Move ipsilon WSGI script from /usr/sbin to /usr/libexec
This command is not intended to be executed by end-users. https://fedorahosted.org/ipsilon/ticket/76 Signed-off-by: Rob Crittenden <rcritten@redhat.com> Reviewed-by: Nathan Kinder <nkinder@redhat.com>
-rw-r--r--contrib/fedora/ipsilon.spec5
-rwxr-xr-xipsilon/install/ipsilon-server-install2
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index c0fe799..8be5f40 100644
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -231,11 +231,12 @@ CFLAGS="%{optflags}" %{__python} setup.py build
%install
%{__python} setup.py install --skip-build --root %{buildroot}
mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_libexecdir}
mkdir -p %{buildroot}%{_defaultdocdir}
# These 0700 permissions are because ipsilon will store private keys here
install -d -m 0700 %{buildroot}%{_sharedstatedir}/ipsilon
install -d -m 0700 %{buildroot}%{_sysconfdir}/ipsilon
-mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_sbindir}
+mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_libexecdir}
mv %{buildroot}/%{_bindir}/ipsilon-server-install %{buildroot}/%{_sbindir}
mv %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
rm -fr %{buildroot}%{python2_sitelib}/tests
@@ -315,7 +316,7 @@ fi
%{_datadir}/ipsilon/ui/img
%{_datadir}/ipsilon/ui/js
%{_datadir}/ipsilon/ui/fonts
-%{_sbindir}/ipsilon
+%{_libexecdir}/ipsilon
%dir %attr(0700,ipsilon,ipsilon) %{_sharedstatedir}/ipsilon
%dir %attr(0700,ipsilon,ipsilon) %{_sysconfdir}/ipsilon
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index 502d4eb..5f95d7e 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -40,7 +40,7 @@ TEMPLATES = '/usr/share/ipsilon/templates/install'
CONFDIR = '/etc/ipsilon'
DATADIR = '/var/lib/ipsilon'
HTTPDCONFD = '/etc/httpd/conf.d'
-BINDIR = '/usr/sbin'
+BINDIR = '/usr/libexec'
STATICDIR = '/usr/share/ipsilon'
WSGI_SOCKET_PREFIX = None