URL: https://github.com/freeipa/freeipa/pull/4905 Author: abbra Title: #4905: [Backport][ipa-4-8] sshd template must be part of client package Action: opened
PR body: """ This PR was opened automatically because PR #4903 was pushed to master and backport to ipa-4-8 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/4905/head:pr4905 git checkout pr4905
From 1995f2b62b447043f342038e39c72651759edd8d Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud <f...@redhat.com> 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 --- 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 472242e621..961a5c8988 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 042403f682..e95796dfbb 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 ba4718f301..f1ccedec4f 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"
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
