[shellinabox] Add css files, do not remove user on uninstall

[Simone Caronni]

commit c4bf32be2912ccc69bced8812ccb720a99316c45
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Sep 13 10:55:17 2012 +0200

    Add css files, do not remove user on uninstall

 shellinabox.spec       |   28 ++++++++++++++++++----------
 shellinaboxd.sysconfig |   11 ++++++++++-
 2 files changed, 28 insertions(+), 11 deletions(-)
---
diff --git a/shellinabox.spec b/shellinabox.spec
index 88b4628..3d16dc3 100644
--- a/shellinabox.spec
+++ b/shellinabox.spec
@@ -2,7 +2,7 @@
 
 Name:           shellinabox
 Version:        2.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Web based AJAX terminal emulator
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -14,6 +14,7 @@ Source3:        shellinaboxd.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         %{name}-2.14-fixkeys.patch
+Patch1:         %{name}-2.14-man-paths.patch
 
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -42,6 +43,7 @@ browser plugins.
 %prep
 %setup -q
 %patch0 -p0 -b .fixkeys
+%patch0 -p1 -b .man-paths
 
 %build
 %configure
@@ -50,24 +52,26 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-mkdir -p %{buildroot}%{_localstatedir}/run/%{name}
 
+mkdir -p %{buildroot}%{_localstatedir}/run/%{name}
 install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd
 install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd
 
+mkdir -p %{buildroot}%{_datadir}/%{name}
+install -p -m 644 shellinabox/black-on-white.css %{buildroot}%{_datarootdir}/%{name}
+install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datarootdir}/%{name}
+install -p -m 644 shellinabox/color.css %{buildroot}%{_datarootdir}/%{name}
+install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datarootdir}/%{name}
+
 %if 0%{?fedora} || 0%{?rhel} > 6
 
 # Systemd unit files
-mkdir -p %{buildroot}%{_unitdir}
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/shellinaboxd.service
 
 %else
 
 # Initscripts
-mkdir -p %{buildroot}%{_initrddir}
 install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd
 
 %endif
@@ -105,10 +109,6 @@ if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || :
 fi
-test "$1" != 0 || userdel %username &>/dev/null || :
-test "$1" != 0 || groupdel %username &>/dev/null || :
-exit 0
-
 
 %endif
 
@@ -154,6 +154,7 @@ exit 0
 %doc AUTHORS NEWS README README.Fedora GPL-2 COPYING
 %config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd
 %{_mandir}/man1/shellinaboxd.1.*
+%{_datadir}/%{name}
 %{_sbindir}/shellinaboxd
 %if 0%{?fedora} || 0%{?rhel} > 6
 %{_unitdir}/shellinaboxd.service
@@ -164,6 +165,13 @@ exit 0
 
 
 %changelog
+* Thu Sep 13 2012 Simone Caronni <negativo17 at gmail.com> - 2.14-10
+- Fixes from (Joel Young <jdy at cryregarder.com>):
+    Install supplied css files.
+    Set menu item to turn off ssl as disabled by default.
+    Do not remove user on uninstall.
+- Simplified spec file.
+
 * Tue Sep 12 2012 Simone Caronni <negativo17 at gmail.com> - 2.14-9
 - Added user/group and confined directory for certificates, based on work from Joel Young.
 
diff --git a/shellinaboxd.sysconfig b/shellinaboxd.sysconfig
index 1903333..039b525 100644
--- a/shellinaboxd.sysconfig
+++ b/shellinaboxd.sysconfig
@@ -1,4 +1,13 @@
 # Shell in a box daemon configuration
 # For details see shellinaboxd man page
 
-OPTS="--cert=/var/run/shellinabox -u shellinabox -g shellinabox -s /:LOGIN"
+# Basic configuration running on port 4200
+OPTS="--cert=/var/run/shellinabox --disable-ssl-menu -u shellinabox -g shellinabox -s /:LOGIN"
+
+# Examples:
+
+# Fancy configuration with right-click menu choice for black-on-white and running on port 443
+# OPTS="--user-css Normal:+black-on-white.css,Reverse:-white-on-black.css --port=443 --disable-ssl-menu --cert=/var/run/shellinabox -u shellinabox -g shellinabox -s /:LOGIN"
+
+# Simple configuration for running it as an SSH console with SSL disabled
+# OPTS="--cert=/var/run/shellinabox -u shellinabox -g shellinabox -t -s /:SSH:host.example.com"