Merge branch 'main' into dependabot/github_actions/actions/checkout-4

EGI-Federation · May 16, 2024 · d591002 · d591002
2 parents 14e2ad9 + 5287f46
commit d591002
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,11 +87,6 @@ jobs:
           yum localinstall -y bdii-*.el7.noarch.rpm
 
   # XXX Dependency from EPEL: glue-schema
-  # FIXME: openldap-servers is in CentOS 8 Stream Powertools, but not in AlmaLinux PowerTools
-  # See https://bugs.almalinux.org/view.php?id=222
-  # Currently instaling using the package from devel repository
-  # See https://bugs.almalinux.org/view.php?id=100
-  # https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/
   install-almalinux8:
     name: Install AlmaLinux 8 RPMs
     needs: build-almalinux8
@@ -104,7 +99,7 @@ jobs:
       - name: Install generated RPMs
         run: |
           yum install -y epel-release
-          yum install -y https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/openldap-servers-2.4.46-18.el8.x86_64.rpm
+          dnf config-manager --set-enabled powertools
           yum localinstall -y bdii-*.el8.noarch.rpm
 
   # XXX Dependencies from EPEL: glue-schema, openldap-servers

diff --git a/etc/systemd/bdii-slapd-start b/etc/systemd/bdii-slapd-start
@@ -18,7 +18,7 @@ DELAYED_DELETE=${DELAYED_DELETE:-${BDII_VAR_DIR}/delayed_delete.pkl}
 BDII_RAM_SIZE=${BDII_RAM_SIZE:-1500M}
 
 if [ "${BDII_IPV6_SUPPORT}" == "yes" ]; then
-    SLAPD_HOST_STRING="'ldap://${SLAPD_HOST}:${SLAPD_PORT} ldap://[${SLAPD_HOST6}]:${SLAPD_PORT}'"
+    SLAPD_HOST_STRING="ldap://${SLAPD_HOST}:${SLAPD_PORT} ldap://[${SLAPD_HOST6}]:${SLAPD_PORT}"
 else
     SLAPD_HOST_STRING="ldap://${SLAPD_HOST}:${SLAPD_PORT}"
 fi
@@ -75,6 +75,5 @@ else
     fi
 fi
 
-COMMAND="${SLAPD} -f ${SLAPD_CONF} -h ${SLAPD_HOST_STRING} -u ${BDII_USER}"
-exec ${COMMAND}
-
+COMMAND="${SLAPD} -f ${SLAPD_CONF} -h \"${SLAPD_HOST_STRING}\" -u ${BDII_USER}"
+exec sh -c "${COMMAND}"