sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

packaging: Remove SWAT references from RHEL-CTDB

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Andreas Schneider 2017-05-09 15:51:08 +02:00 committed by Andreas Schneider
parent 0a23cde8ef
commit 219505fed7
3 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/RHEL-CTDB/configure.rpm
View File

@ -44,8 +44,6 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
--mandir=${_mandir} \
--with-piddir=/var/run \
--with-privatedir=${_sysconfdir}/samba \
--with-sambabook=${_datadir}/swat/using_samba \
--with-swatdir=${_datadir}/swat \
--disable-cups \
--with-acl-support \
--with-ads \

38
packaging/RHEL-CTDB/samba.spec.tmpl
View File

@ -99,19 +99,6 @@ packages of Samba.
#######################################################################
%package swat
Summary: The Samba SMB server configuration program.
Group: Applications/System
Requires: samba = %{version} xinetd
Provides: samba-swat = %{version}-%{release}
%description swat
The samba-swat package includes the new SWAT (Samba Web Administration
Tool), for remotely managing Samba's smb.conf file using your favorite
Web browser.
#######################################################################
%package doc
Summary: Samba Documentation
@ -120,9 +107,9 @@ Provides: samba-doc = %{version}-%{release}
Requires: /usr/bin/find /bin/rm /usr/bin/xargs
%description doc
The samba-doc package includes the HTML versions of the Samba manpages
utilized by SWAT as well as the HTML and PDF version of "Using Samba",
"Samba By Example", and "The Official Samba HOWTO and Reference Guide".
The samba-doc package includes the HTML versions of the Samba manpages as well
as the HTML and PDF version of "Using Samba", "Samba By Example", and "The
Official Samba HOWTO and Reference Guide".
#######################################################################
@ -226,7 +213,6 @@ find examples docs -type f | xargs -r chmod -x
rm -rf $RPM_BUILD_ROOT
# Create the target build directory hierarchy
mkdir -p $RPM_BUILD_ROOT%{_datadir}/samba/swat/{help,include,using_samba/{figs,gifsa}}
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
@ -280,7 +266,6 @@ cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/
# Install the miscellany
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
install -m644 setup/swat $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
@ -339,12 +324,6 @@ exit 0
#%postun
%post swat
# Add swat entry to /etc/services if not already there.
if [ ! "`grep ^\s**swat /etc/services`" ]; then
echo 'swat 901/tcp # Add swat service used via inetd' >> /etc/services
fi
%post common
/sbin/ldconfig
@ -463,17 +442,6 @@ exit 0
##########
%files swat
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/xinetd.d/swat
%dir %{_datadir}/samba/swat
%{_datadir}/samba/swat/*
%{_sbindir}/swat
%{_mandir}/man8/swat.8*
%attr(755,root,root) %{_datadir}/samba/codepages/*.msg
##########
%files client
%defattr(-,root,root)

15
packaging/RHEL-CTDB/setup/swat
View File

@ -1,15 +0,0 @@
# default: off
# description: SWAT is the Samba Web Admin Tool. Use swat \
# to configure your Samba server. To use SWAT, \
# connect to port 901 with your favorite web browser.
service swat
{
port = 901
socket_type = stream
wait = no
only_from = 127.0.0.1
user = root
server = /usr/sbin/swat
log_on_failure += USERID
disable = yes
}