#336 Move Ipsilon libexec content to a subdirectory
Merged a year ago by ngompa. Opened a year ago by ngompa.
ngompa/ipsilon fix-libexecdir  into  master

file modified
+3 -3
@@ -261,13 +261,13 @@ 

  %install

  %{__python} setup.py install --skip-build --root %{buildroot}

  mkdir -p %{buildroot}%{_sbindir}

- mkdir -p %{buildroot}%{_libexecdir}

+ mkdir -p %{buildroot}%{_libexecdir}/ipsilon

  mkdir -p %{buildroot}%{_defaultdocdir}

  mkdir -p %{buildroot}%{_localstatedir}/cache/ipsilon

  # 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}/%{_libexecdir}

+ mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_libexecdir}/ipsilon

  mv %{buildroot}/%{_bindir}/ipsilon-db2conf %{buildroot}/%{_sbindir}

  mv %{buildroot}/%{_bindir}/ipsilon-server-install %{buildroot}/%{_sbindir}

  mv %{buildroot}/%{_bindir}/ipsilon-upgrade-database %{buildroot}/%{_sbindir}
@@ -359,7 +359,7 @@ 

  %{_datadir}/ipsilon/ui/js

  %{_datadir}/ipsilon/ui/fonts

  %{_datadir}/ipsilon/ui/fonts-local

- %{_libexecdir}/ipsilon

+ %{_libexecdir}/ipsilon/

  %dir %attr(0751,root,root) %{_sharedstatedir}/ipsilon

  %dir %attr(0751,root,root) %{_sysconfdir}/ipsilon

  %dir %attr(0750,ipsilon,apache) %{_localstatedir}/cache/ipsilon

file modified
+2 -2
@@ -1,5 +1,5 @@ 

  Alias /idp/ui /usr/share/ipsilon/ui

- WSGIScriptAlias /idp /usr/libexec/ipsilon.py

+ WSGIScriptAlias /idp /usr/libexec/ipsilon/ipsilon.py

  WSGIDaemonProcess idp maximum-requests=2 user=ipsilon group=ipsilon

  WSGIProcessGroup idp

  
@@ -15,7 +15,7 @@ 

    ErrorDocument 500 /idp/login/gssapi/failed

  </Location>

  

- <Directory /usr/libexec>

+ <Directory /usr/libexec/ipsilon>
simo commented a year ago

Do we really need this just to run scripts ?

ngompa commented a year ago

I am not sure we need this, but I'm not sure how to qualify safely removing this...

      Order allow,deny

      Allow from all

      Require all granted

@@ -31,7 +31,7 @@ 

  CONFDIR = '/etc/ipsilon'

  DATADIR = '/var/lib/ipsilon'

  HTTPDCONFD = '/etc/httpd/conf.d'

- BINDIR = '/usr/libexec'

+ BINDIR = '/usr/libexec/ipsilon'

  STATICDIR = '/usr/share/ipsilon'

  CACHEDIR = '/var/cache/ipsilon'

  WSGI_SOCKET_PREFIX = None

It's generally not a good idea to expose the entirety of /usr/libexec
through the web server, so move the needed binaries to be exposed to
a subdirectory.

Signed-off-by: Neal Gompa ngompa13@gmail.com

rebased onto f673c9f

a year ago

Do we really need this just to run scripts ?

I am not sure we need this, but I'm not sure how to qualify safely removing this...

Yeah, the patch is good, we can remove another time if possible.