From 797a64b370fad5a0a26ebeeb3e4f34c3c88c0096 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Thu, 9 Jul 2020 10:35:00 +0200 Subject: [PATCH] sshd template must be part of client package The sshd_ipa.conf.template must be shipped with the client pkgs in /usr/share/ipa/client but is currently delivered in /usr/share/ipa. Fix the file location. Fixes: https://pagure.io/freeipa/issue/8400 Reviewed-By: Alexander Bokovoy Reviewed-By: Christian Heimes --- client/share/Makefile.am | 1 + {install => client}/share/sshd_ipa.conf.template | 0 install/share/Makefile.am | 1 - ipaplatform/base/paths.py | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {install => client}/share/sshd_ipa.conf.template (100%) diff --git a/client/share/Makefile.am b/client/share/Makefile.am index 472242e62..961a5c898 100644 --- a/client/share/Makefile.am +++ b/client/share/Makefile.am @@ -3,6 +3,7 @@ NULL = appdir = $(IPA_DATA_DIR)/client dist_app_DATA = \ freeipa.template \ + sshd_ipa.conf.template \ $(NULL) epnconfdir = $(IPA_SYSCONF_DIR) diff --git a/install/share/sshd_ipa.conf.template b/client/share/sshd_ipa.conf.template similarity index 100% rename from install/share/sshd_ipa.conf.template rename to client/share/sshd_ipa.conf.template diff --git a/install/share/Makefile.am b/install/share/Makefile.am index 042403f68..e95796dfb 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -101,7 +101,6 @@ dist_app_DATA = \ ipaca_default.ini \ ipaca_customize.ini \ ipaca_softhsm2.ini \ - sshd_ipa.conf.template \ $(NULL) kdcproxyconfdir = $(IPA_SYSCONF_DIR)/kdcproxy diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index ba4718f30..f1ccedec4 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -127,7 +127,7 @@ class BasePathNamespace: SSH_CONFIG = "/etc/ssh/ssh_config" SSHD_CONFIG = "/etc/ssh/sshd_config" SSHD_IPA_CONFIG = "/etc/ssh/sshd_config.d/04-ipa.conf" - SSHD_IPA_CONFIG_TEMPLATE = "/usr/share/ipa/sshd_ipa.conf.template" + SSHD_IPA_CONFIG_TEMPLATE = "/usr/share/ipa/client/sshd_ipa.conf.template" SSSD_CONF = "/etc/sssd/sssd.conf" SSSD_CONF_BKP = "/etc/sssd/sssd.conf.bkp" SSSD_CONF_DELETED = "/etc/sssd/sssd.conf.deleted"