* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-29.sme

- change key type from service to configuration [SME: 11367]
* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-28.sme
2025-03-05 22:10:01 -05:00 · 2025-02-20 22:55:39 -05:00 · 2025-02-16 02:18:26 -05:00
14 changed files with 27 additions and 7 deletions
--- a/root/etc/e-smith/db/configuration/defaults/modSSL/type
+++ b/root/etc/e-smith/db/configuration/defaults/modSSL/type
@@ -1 +1 @@
-service
+configuration
--- a/root/etc/e-smith/db/configuration/defaults/pam_abl/type
+++ b/root/etc/e-smith/db/configuration/defaults/pam_abl/type
@@ -1 +1 @@
-service
+configuration
--- a/root/etc/e-smith/db/configuration/defaults/pam_faillock/type
+++ b/root/etc/e-smith/db/configuration/defaults/pam_faillock/type
@@ -1 +1 @@
-service
+configuration
--- a/root/etc/e-smith/db/configuration/defaults/pppoe/type
+++ b/root/etc/e-smith/db/configuration/defaults/pppoe/type
@@ -1 +1 @@
-service
+configuration
--- a/root/etc/e-smith/db/configuration/defaults/serial-console/type
+++ b/root/etc/e-smith/db/configuration/defaults/serial-console/type
@@ -1 +1 @@
-service
+configuration
--- a/root/etc/e-smith/db/configuration/migrate/smeserver-base-configuration
+++ b/root/etc/e-smith/db/configuration/migrate/smeserver-base-configuration
@@ -0,0 +1,5 @@
+{
+ foreach my $sservice (qw(serial-console pppoe modSSL pam_abl pam_faillock)) {
+  $DB->set_prop($sservice, "type", "configuration") if  ${$sservice}{type} eq "service";
+  }
+}
--- a/root/etc/e-smith/templates/etc/shells/bash
+++ b/root/etc/e-smith/templates/etc/shells/bash
@@ -1 +1,2 @@
 /bin/bash
+/usr/bin/bash
--- a/root/etc/e-smith/templates/etc/shells/bash2
+++ b/root/etc/e-smith/templates/etc/shells/bash2
@@ -1 +1,2 @@
 /bin/bash2
+/usr/bin/bash2
--- a/root/etc/e-smith/templates/etc/shells/console
+++ b/root/etc/e-smith/templates/etc/shells/console
@@ -1 +1,2 @@
 /sbin/e-smith/console
+/usr/sbin/e-smith/console
--- a/root/etc/e-smith/templates/etc/shells/csh
+++ b/root/etc/e-smith/templates/etc/shells/csh
@@ -1 +1,2 @@
 /bin/csh
+/usr/bin/csh
--- a/root/etc/e-smith/templates/etc/shells/false
+++ b/root/etc/e-smith/templates/etc/shells/false
@@ -1 +1,2 @@
 /bin/false
+/usr/bin/false
--- a/root/etc/e-smith/templates/etc/shells/sh
+++ b/root/etc/e-smith/templates/etc/shells/sh
@@ -1 +1,2 @@
 /bin/sh
+/usr/bin/sh
--- a/root/usr/lib/systemd/system/sme-server.target
+++ b/root/usr/lib/systemd/system/sme-server.target
@@ -8,6 +8,6 @@ Requires=basic.target
 Conflicts=rescue.service rescue.target multi-user.target
 After=basic.target rescue.service rescue.target runit.service
 AllowIsolate=yes
-Wants=atd.service auditd.service avahi-daemon.service brandbot.path nfs-client.target remote-fs.target rhel-configure.service
+Wants=atd.service auditd.service avahi-daemon.service nfs-client.target remote-fs.target 
 Wants=dbus.service plymouth-quit-wait.service plymouth-quit.service systemd-logind.service systemd-update-utmp-runlevel.service systemd-user-sessions.service

--- a/smeserver-base.spec
+++ b/smeserver-base.spec
@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module
 %define name smeserver-base
 Name: %{name}
 %define version 11.0.0
-%define release 26
+%define release 29
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -192,6 +192,15 @@ fi


 %changelog
+* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-29.sme
+- change key type from service to configuration [SME: 11367]
+
+* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-28.sme
+- clean sme-server.target [SME: 12931]
+
+* Sun Feb 16 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-27.sme
+- fix missing allowed shell for login [SME: 12926]
+
 * Wed Feb 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-26.sme
 - add pam_abl requirement [SME: 12914]
 - add isdn4k-utils requirement for ippp isdn connections [SME: 12909]
Author	SHA1	Message	Date
Jean-Philippe Pialasse	f0f7b201cc	* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-29.sme - change key type from service to configuration [SME: 11367]	2025-03-05 22:10:01 -05:00
Jean-Philippe Pialasse	d0b26d9228	* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-28.sme - clean sme-server.target [SME: 12931]	2025-02-20 22:55:39 -05:00
Jean-Philippe Pialasse	c58758fe43	* Sun Feb 16 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-27.sme - fix missing allowed shell for login [SME: 12926]	2025-02-16 02:18:26 -05:00