mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Move radius server components into a separate package.
This commit is contained in:
parent
cecbca1a84
commit
cf595511ff
28
Makefile
28
Makefile
@ -1,4 +1,4 @@
|
||||
SUBDIRS=ipa-server ipa-admintools ipa-python ipa-client
|
||||
SUBDIRS=ipa-server ipa-admintools ipa-python ipa-client ipa-radius-server
|
||||
|
||||
PRJ_PREFIX=ipa
|
||||
|
||||
@ -35,6 +35,13 @@ CLI_VERSION=$(CLI_MAJOR).$(CLI_MINOR).$(CLI_RELEASE)
|
||||
CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(CLI_VERSION)
|
||||
CLI_TARBALL=$(CLI_TARBALL_PREFIX).tgz
|
||||
|
||||
RADIUS_SERVER_MAJOR=0
|
||||
RADIUS_SERVER_MINOR=5
|
||||
RADIUS_SERVER_RELEASE=0
|
||||
RADIUS_SERVER_VERSION=$(RADIUS_SERVER_MAJOR).$(RADIUS_SERVER_MINOR).$(RADIUS_SERVER_RELEASE)
|
||||
RADIUS_SERVER_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)
|
||||
RADIUS_SERVER_TARBALL=$(RADIUS_SERVER_TARBALL_PREFIX).tgz
|
||||
|
||||
LIBDIR ?= /usr/lib
|
||||
|
||||
all: bootstrap-autogen
|
||||
@ -77,6 +84,9 @@ version-update:
|
||||
sed s/VERSION/$(CLI_VERSION)/ ipa-client/ipa-client.spec.in \
|
||||
> ipa-client/ipa-client.spec
|
||||
|
||||
sed s/VERSION/$(RADIUS_SERVER_VERSION)/ ipa-radius-server/ipa-radius-server.spec.in \
|
||||
> ipa-radius-server/ipa-radius-server.spec
|
||||
|
||||
|
||||
archive:
|
||||
-mkdir -p dist
|
||||
@ -120,6 +130,13 @@ tarballs:
|
||||
cd dist; tar cfz sources/$(CLI_TARBALL) $(CLI_TARBALL_PREFIX)
|
||||
rm -fr dist/$(CLI_TARBALL_PREFIX)
|
||||
|
||||
# ipa-radius-server
|
||||
mv dist/ipa/ipa-radius-server dist/$(RADIUS_SERVER_TARBALL_PREFIX)
|
||||
rm -f dist/sources/$(RADIUS_SERVER_TARBALL)
|
||||
cd dist; tar cfz sources/$(RADIUS_SERVER_TARBALL) $(RADIUS_SERVER_TARBALL_PREFIX)
|
||||
rm -fr dist/$(RADIUS_SERVER_TARBALL_PREFIX)
|
||||
|
||||
|
||||
rpmroot:
|
||||
mkdir -p $(RPMBUILD)/BUILD
|
||||
mkdir -p $(RPMBUILD)/RPMS
|
||||
@ -155,7 +172,14 @@ rpm-ipa-client:
|
||||
cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-client-$(CLI_VERSION)-*.rpm dist/rpms/
|
||||
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-client-$(CLI_VERSION)-*.src.rpm dist/srpms/
|
||||
|
||||
rpms: rpmroot rpmdistdir rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client
|
||||
rpm-ipa-radius-server:
|
||||
cp dist/sources/$(RADIUS_SERVER_TARBALL) $(RPMBUILD)/SOURCES/.
|
||||
rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-radius-server/ipa-radius-server.spec
|
||||
cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)-*.rpm dist/rpms/
|
||||
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)-*.src.rpm dist/srpms/
|
||||
|
||||
|
||||
rpms: rpmroot rpmdistdir rpm-ipa-server rpm-ipa-admin rpm-ipa-python rpm-ipa-client rpm-ipa-radius-server
|
||||
|
||||
repodata:
|
||||
-createrepo -p dist
|
||||
|
@ -18,6 +18,7 @@
|
||||
#
|
||||
|
||||
SHARE_DIR = "/usr/share/ipa/"
|
||||
PLUGINS_SHARE_DIR = "/usr/share/ipa/plugins"
|
||||
|
||||
import string
|
||||
import tempfile
|
||||
|
@ -79,7 +79,7 @@ RADIUS_USER = 'radiusd'
|
||||
RADIUS_IPA_KEYTAB_FILEPATH = os.path.join(RADIUS_PKG_CONFIG_DIR, 'ipa.keytab')
|
||||
RADIUS_LDAP_ATTR_MAP_FILEPATH = os.path.join(RADIUS_PKG_CONFIG_DIR, 'ldap.attrmap')
|
||||
RADIUSD_CONF_FILEPATH = os.path.join(RADIUS_PKG_CONFIG_DIR, 'radiusd.conf')
|
||||
RADIUSD_CONF_TEMPLATE_FILEPATH = os.path.join(ipautil.SHARE_DIR, 'radius.radiusd.conf.template')
|
||||
RADIUSD_CONF_TEMPLATE_FILEPATH = os.path.join(ipautil.PLUGINS_SHARE_DIR, 'radius.radiusd.conf.template')
|
||||
|
||||
RADIUSD = '/usr/sbin/radiusd'
|
||||
|
||||
|
20
ipa-radius-server/Makefile
Normal file
20
ipa-radius-server/Makefile
Normal file
@ -0,0 +1,20 @@
|
||||
PLUGINS_SHARE = $(DESTDIR)/usr/share/ipa/plugins
|
||||
PLUGINS_PYTHON = $(DESTDIR)/usr/share/ipa/ipaserver/plugins
|
||||
SBINDIR = $(DESTDIR)/usr/sbin
|
||||
|
||||
all:
|
||||
|
||||
install:
|
||||
-mkdir -p $(PLUGINS_SHARE)
|
||||
-mkdir -p $(PLUGINS_PYTHON)
|
||||
-mkdir -p $(PLUGINS_SBINDIR)
|
||||
install -m 644 plugins/*.py $(PLUGINS_PYTHON)
|
||||
install -m 644 share/*.template $(PLUGINS_SHARE)
|
||||
install -m 755 ipa-radius-install $(SBINDIR)
|
||||
|
||||
clean:
|
||||
rm -fr *.pyc *~
|
||||
|
||||
distclean: clean
|
||||
|
||||
test:
|
@ -23,7 +23,8 @@ sys.path.append("/usr/share/ipa")
|
||||
|
||||
import traceback, logging, krbV
|
||||
|
||||
from ipaserver import radiusinstance, installutils
|
||||
from ipaserver import installutils
|
||||
from ipaserver.plugins import radiusinstance
|
||||
|
||||
from ipa import ipautil
|
||||
|
50
ipa-radius-server/ipa-radius-server.spec
Executable file
50
ipa-radius-server/ipa-radius-server.spec
Executable file
@ -0,0 +1,50 @@
|
||||
Name: ipa-radius-server
|
||||
Version: 0.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: IPA authentication server - radius plugin
|
||||
|
||||
Group: System Environment/Base
|
||||
License: GPL
|
||||
URL: http://www.freeipa.org
|
||||
Source0: %{name}-%{version}.tgz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: python
|
||||
Requires: ipa-server
|
||||
Requires: freeradius
|
||||
|
||||
%description
|
||||
Radius plugin for an IPA server
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/ipa*
|
||||
|
||||
%dir %{_usr}/share/ipa/plugins
|
||||
%{_usr}/share/ipa/plugins/*
|
||||
|
||||
%dir %{_usr}/share/ipa/ipaserver/plugins
|
||||
%{_usr}/share/ipa/ipaserver/plugins/*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
|
||||
- Initial version
|
||||
|
||||
|
||||
|
||||
|
50
ipa-radius-server/ipa-radius-server.spec.in
Executable file
50
ipa-radius-server/ipa-radius-server.spec.in
Executable file
@ -0,0 +1,50 @@
|
||||
Name: ipa-radius-server
|
||||
Version: VERSION
|
||||
Release: 1%{?dist}
|
||||
Summary: IPA authentication server - radius plugin
|
||||
|
||||
Group: System Environment/Base
|
||||
License: GPL
|
||||
URL: http://www.freeipa.org
|
||||
Source0: %{name}-%{version}.tgz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: python
|
||||
Requires: ipa-server
|
||||
Requires: freeradius
|
||||
|
||||
%description
|
||||
Radius plugin for an IPA server
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/ipa*
|
||||
|
||||
%dir %{_usr}/share/ipa/plugins
|
||||
%{_usr}/share/ipa/plugins/*
|
||||
|
||||
%dir %{_usr}/share/ipa/ipaserver/plugins
|
||||
%{_usr}/share/ipa/ipaserver/plugins/*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
|
||||
- Initial version
|
||||
|
||||
|
||||
|
||||
|
1
ipa-radius-server/plugins/__init__.py
Normal file
1
ipa-radius-server/plugins/__init__.py
Normal file
@ -0,0 +1 @@
|
||||
# intentionally empty
|
@ -19,6 +19,8 @@
|
||||
#
|
||||
|
||||
import sys
|
||||
sys.path.append("/usr/share/ipa")
|
||||
|
||||
import subprocess
|
||||
import string
|
||||
import tempfile
|
||||
@ -30,7 +32,7 @@ import sys
|
||||
from ipa.ipautil import *
|
||||
from ipa import radius_util
|
||||
|
||||
import service
|
||||
from ipaserver import service
|
||||
|
||||
import os
|
||||
import re
|
@ -9,7 +9,6 @@ sbin_SCRIPTS = \
|
||||
ipa-replica-install \
|
||||
ipa-replica-prepare \
|
||||
ipa-server-certinstall \
|
||||
ipa-radius-install \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST = \
|
||||
|
@ -20,7 +20,6 @@ app_DATA = \
|
||||
krbrealm.con.template \
|
||||
ntp.conf.server.template \
|
||||
preferences.html.template \
|
||||
radius.radiusd.conf.template \
|
||||
referint-conf.ldif \
|
||||
dna-posix.ldif \
|
||||
master-entry.ldif \
|
||||
|
@ -37,7 +37,6 @@ Requires: python-krbV
|
||||
Requires: TurboGears
|
||||
Requires: python-tgexpandingformwidget
|
||||
Requires: acl
|
||||
Requires: freeradius
|
||||
Requires: pyasn1
|
||||
Requires: libcap
|
||||
|
||||
|
@ -37,7 +37,6 @@ Requires: python-krbV
|
||||
Requires: TurboGears
|
||||
Requires: python-tgexpandingformwidget
|
||||
Requires: acl
|
||||
Requires: freeradius
|
||||
Requires: pyasn1
|
||||
Requires: libcap
|
||||
|
||||
|
@ -9,7 +9,6 @@ app_PYTHON = \
|
||||
krbinstance.py \
|
||||
httpinstance.py \
|
||||
ntpinstance.py \
|
||||
radiusinstance.py \
|
||||
webguiinstance.py \
|
||||
service.py \
|
||||
installutils.py \
|
||||
|
Loading…
Reference in New Issue
Block a user