1 files changed, 5 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index b5d2a36..67bbfe7 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,13 @@ src_bin_programs = xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh
 btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh               \
 dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \
 selfstrap samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout    \
-kiki-import-stdin store-child-permanently samizdat-ssh-uid $(dyndns_progs)      \
-git-ll-remote
+kiki-import-stdin store-child-permanently $(dyndns_progs) git-ll-remote
 
 bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils}
 
+dyndns_programs = cryptonomic-dyndns-command samizdat-ssh-command samizdat-ssh-uid
+bin_programs += $(addprefix cryptonomic-dyndns-server/bin/, $(dyndns_programs))
+
 btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed)
 
 initrd_files:=$(wildcard src/initrd/*) dynmenu samizdat-pinentry wait_for_files
@@ -66,31 +68,6 @@ samizdat-paths.sh: src/samizdat-paths.in
         @sed -e "s?PREFIX?$(prefix)?g" $< > $@
 include samizdat-paths.sh
 
-DD_USER = dyndns
-DD_GROUP = dyndns
-
-install-dyndns-server:
-ifneq ($(shell id -u),0)
-        $(SUDO_MAKE) $@
-else
-        : apt install pdns
-        : adduser $(DD_USER)
-        chown root:$(DD_GROUP) /etc/powerdns
-        chown pdns:$(DD_GROUP) /etc/powerdns/powerdns.sqlite3
-        chmod g+rwx /etc/powerdns
-        chmod g+rw /etc/powerdns/powerdns.sqlite3
-        $(MAKE) ~$(DD_USER)/.ssh/authorized_keys
-        install src/samizdat-ssh-command /usr/local/bin/
-        install src/dyndns-command.sh ~$(DD_USER)/samizdat-default-command
-endif
-
-define dyndns_authorized_keys_contents
-command="/usr/local/bin/samizdat-ssh-command /etc/powerdns/dyndns-command.sh",no-port-forwarding * Samizdat - YES WE CAN
-endef
-
-~$(DD_USER)/.ssh/authorized_keys:
-        : writing file $@  $(file >$@,$(dyndns_authorized_keys_contents))
-
 install-nested-kvm: conf/kvm.conf
         install -m0644 conf/kvm.conf ${instdir}/etc/modprobe.d/
         modprobe -r kvm-intel kvm-amd kvm; modprobe kvm; modprobe kvm-intel; modprobe kvm-amd; true
@@ -348,7 +325,7 @@ install-submodules-stamp: install-submodules
         touch $@
 
 install-bin-programs: ${bin_programs}
-        install -p ${bin_programs} ${instdir}${samizdat_bindir}
+        install -D -p -t ${instdir}${samizdat_bindir} ${bin_programs}
 
 CP=cp --preserve=timestamps -r