diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-02 20:48:08 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
| commit | 312e780041fc9025ca3c189e6c9fcb54c7340714 (patch) | |
| tree | 36aeca6699771c1a21d42f0f08961fddcc04b5b3 /daemons | |
| parent | f229bb56b73487758ed9bd9c7f0a4cc74134992b (diff) | |
| download | freeipa-312e780041fc9025ca3c189e6c9fcb54c7340714.tar.gz freeipa-312e780041fc9025ca3c189e6c9fcb54c7340714.tar.xz freeipa-312e780041fc9025ca3c189e6c9fcb54c7340714.zip | |
Build: integrate daemons/dnssec into build system
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/Makefile.am | 1 | ||||
| -rw-r--r-- | daemons/dnssec/Makefile.am | 32 | ||||
| -rw-r--r-- | daemons/dnssec/ipa-dnskeysyncd.service.in (renamed from daemons/dnssec/ipa-dnskeysyncd.service) | 4 | ||||
| -rw-r--r-- | daemons/dnssec/ipa-ods-exporter.service.in (renamed from daemons/dnssec/ipa-ods-exporter.service) | 4 | ||||
| -rw-r--r-- | daemons/dnssec/ipa-ods-exporter.socket | 5 | ||||
| -rw-r--r-- | daemons/dnssec/ipa-ods-exporter.socket.in | 5 |
6 files changed, 42 insertions, 9 deletions
diff --git a/daemons/Makefile.am b/daemons/Makefile.am index f919429dc..7ae7b3cbb 100644 --- a/daemons/Makefile.am +++ b/daemons/Makefile.am @@ -13,6 +13,7 @@ endif export AM_CFLAGS SUBDIRS = \ + dnssec \ ipa-kdb \ ipa-slapi-plugins \ ipa-sam \ diff --git a/daemons/dnssec/Makefile.am b/daemons/dnssec/Makefile.am new file mode 100644 index 000000000..37a0dcf51 --- /dev/null +++ b/daemons/dnssec/Makefile.am @@ -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) diff --git a/daemons/dnssec/ipa-dnskeysyncd.service b/daemons/dnssec/ipa-dnskeysyncd.service.in index ecd38a593..f39c3ceb4 100644 --- a/daemons/dnssec/ipa-dnskeysyncd.service +++ b/daemons/dnssec/ipa-dnskeysyncd.service.in @@ -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 diff --git a/daemons/dnssec/ipa-ods-exporter.service b/daemons/dnssec/ipa-ods-exporter.service.in index 0d917b8d3..5ec7317b8 100644 --- a/daemons/dnssec/ipa-ods-exporter.service +++ b/daemons/dnssec/ipa-ods-exporter.service.in @@ -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 diff --git a/daemons/dnssec/ipa-ods-exporter.socket b/daemons/dnssec/ipa-ods-exporter.socket deleted file mode 100644 index 1499f1823..000000000 --- a/daemons/dnssec/ipa-ods-exporter.socket +++ /dev/null @@ -1,5 +0,0 @@ -[Socket] -ListenStream=/var/run/opendnssec/engine.sock - -[Install] -WantedBy=sockets.target diff --git a/daemons/dnssec/ipa-ods-exporter.socket.in b/daemons/dnssec/ipa-ods-exporter.socket.in new file mode 100644 index 000000000..ffc699407 --- /dev/null +++ b/daemons/dnssec/ipa-ods-exporter.socket.in @@ -0,0 +1,5 @@ +[Socket] +ListenStream=@localstatedir@/opendnssec/engine.sock + +[Install] +WantedBy=sockets.target |