IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build: integrate daemons/dnssec into build system

Browse Source 
https://fedorahosted.org/freeipa/ticket/6418

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Petr Spacek 2016-11-02 20:48:08 +01:00 committed by Martin Babinsky
parent f229bb56b7
commit 312e780041
9 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -47,6 +47,9 @@ freeipa2-dev-doc
*.egg-info
# Subdirectories
/daemons/dnssec/ipa-dnskeysyncd.service
/daemons/dnssec/ipa-ods-exporter.service
/daemons/dnssec/ipa-ods-exporter.socket
/daemons/ipa-otpd/ipa-otpd
/daemons/ipa-otpd/ipa-otpd.socket
/daemons/ipa-otpd/ipa-otpd@.service

14
configure.ac
View File

@ -251,6 +251,16 @@ AC_ARG_WITH([systemdsystemunitdir],
[systemdsystemunitdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=systemdsystemunitdir systemd)])
AC_SUBST([systemdsystemunitdir])
dnl ---------------------------------------------------------------------------
dnl - Get /etc/sysconfig directory path
dnl ---------------------------------------------------------------------------
AC_ARG_WITH([sysconfenvdir],
AS_HELP_STRING([--with-sysconfenvdir=DIR],
[Directory for daemon environment files]),
[sysconfenvdir=$with_sysconfenvdir],
[sysconfenvdir="${sysconfdir}/sysconfig"])
AC_SUBST([sysconfenvdir])
dnl ---------------------------------------------------------------------------
dnl - Check for program paths
dnl ---------------------------------------------------------------------------
@ -415,6 +425,9 @@ AC_CONFIG_FILES([
asn1/asn1c/Makefile
client/Makefile
client/man/Makefile
contrib/completion/Makefile
contrib/Makefile
daemons/dnssec/Makefile
daemons/Makefile
daemons/ipa-kdb/Makefile
daemons/ipa-sam/Makefile
@ -492,6 +505,7 @@ echo "
bindir: ${bindir}
sbindir: ${sbindir}
sysconfdir: ${sysconfdir}
sysconfenvdir: ${sysconfenvdir}
localstatedir: ${localstatedir}
datadir: ${datadir}
krb5rundir: ${krb5rundir}

1
daemons/Makefile.am
View File

@ -13,6 +13,7 @@ endif
export AM_CFLAGS
SUBDIRS = \
dnssec \
ipa-kdb \
ipa-slapi-plugins \
ipa-sam \

32
daemons/dnssec/Makefile.am Normal file
View File

@ -0,0 +1,32 @@
# This file will be processed with automake-1.7 to create Makefile.in
#
AUTOMAKE_OPTIONS = 1.7
appdir = $(libexecdir)/ipa/
dist_app_SCRIPTS = \
ipa-dnskeysyncd \
ipa-dnskeysync-replica \
ipa-ods-exporter
dist_noinst_DATA = \
ipa-dnskeysyncd.service.in \
ipa-ods-exporter.service.in \
ipa-ods-exporter.socket.in
systemdsystemunit_DATA = \
ipa-dnskeysyncd.service \
ipa-ods-exporter.service \
ipa-ods-exporter.socket
CLEANFILES = $(systemdsystemunit_DATA)
%: %.in Makefile
sed \
-e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@sysconfenvdir[@]|$(sysconfenvdir)|g' \
'$(srcdir)/$@.in' >$@
dnssecconfdir = $(IPA_SYSCONF_DIR)/dnssec
install-data-hook:
$(INSTALL) -d -m 755 $(DESTDIR)$(dnssecconfdir)

4
daemons/dnssec/ipa-dnskeysyncd.service → daemons/dnssec/ipa-dnskeysyncd.service.in
View File

@ -2,8 +2,8 @@
Description=IPA key daemon
[Service]
EnvironmentFile=/etc/sysconfig/ipa-dnskeysyncd
ExecStart=/usr/libexec/ipa/ipa-dnskeysyncd
EnvironmentFile=@sysconfenvdir@/ipa-dnskeysyncd
ExecStart=@libexecdir@/ipa/ipa-dnskeysyncd
User=ods
Group=named
SupplementaryGroups=ods

4
daemons/dnssec/ipa-ods-exporter.service → daemons/dnssec/ipa-ods-exporter.service.in
View File

@ -4,8 +4,8 @@ Wants=ipa-ods-exporter.socket
After=ipa-ods-exporter.socket
[Service]
EnvironmentFile=/etc/sysconfig/ipa-ods-exporter
ExecStart=/usr/libexec/ipa/ipa-ods-exporter
EnvironmentFile=@sysconfenvdir@/ipa-ods-exporter
ExecStart=@libexecdir@/ipa/ipa-ods-exporter
User=ods
PrivateTmp=yes
Restart=on-failure

5
daemons/dnssec/ipa-ods-exporter.socket
View File

@ -1,5 +0,0 @@
[Socket]
ListenStream=/var/run/opendnssec/engine.sock
[Install]
WantedBy=sockets.target

5
daemons/dnssec/ipa-ods-exporter.socket.in Normal file
View File

@ -0,0 +1,5 @@
[Socket]
ListenStream=@localstatedir@/opendnssec/engine.sock
[Install]
WantedBy=sockets.target

13
freeipa.spec.in
View File

@ -792,26 +792,13 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
mkdir -p %{buildroot}%{_initrddir}
mkdir %{buildroot}%{_sysconfdir}/sysconfig/
install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached
install -m 644 init/ipa-dnskeysyncd.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa-dnskeysyncd
install -m 644 init/ipa-ods-exporter.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa-ods-exporter
install -m 644 daemons/dnssec/ipa-ods-exporter.socket %{buildroot}%{_unitdir}/ipa-ods-exporter.socket
install -m 644 daemons/dnssec/ipa-ods-exporter.service %{buildroot}%{_unitdir}/ipa-ods-exporter.service
install -m 644 daemons/dnssec/ipa-dnskeysyncd.service %{buildroot}%{_unitdir}/ipa-dnskeysyncd.service
# dnssec daemons
mkdir -p %{buildroot}%{_libexecdir}/ipa/
install daemons/dnssec/ipa-dnskeysyncd %{buildroot}%{_libexecdir}/ipa/ipa-dnskeysyncd
install daemons/dnssec/ipa-dnskeysync-replica %{buildroot}%{_libexecdir}/ipa/ipa-dnskeysync-replica
install daemons/dnssec/ipa-ods-exporter %{buildroot}%{_libexecdir}/ipa/ipa-ods-exporter
# Web UI plugin dir
mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins
# DNSSEC config
mkdir -p %{buildroot}%{_sysconfdir}/ipa/dnssec
# KDC proxy config (Apache config sets KDCPROXY_CONFIG to load this file)
mkdir -p %{buildroot}%{_sysconfdir}/ipa/kdcproxy/
install -m 644 install/share/kdcproxy.conf %{buildroot}%{_sysconfdir}/ipa/kdcproxy/kdcproxy.conf