* Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme

- add vlan support on External Interface [SME: 12677]
- fix typo [SME: 12763]

root/etc/e-smith/events/actions/group-delete-unix

@@ -60,6 +60,6 @@ $result = $ldap->ldapdelgroup($groupName);
 $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (ldap) group $groupName.\n" );
 
 # delete mail spool file
-unless ($x == 255) { (if -e "/var/spool/mail/$groupName" ) {unlink("/var/spool/mail/$groupName") or ( $x = 255, warn "Failed to delete /var/spool/mail/$groupName.\n" );} }
+unless ($x == 255) { if ( -e "/var/spool/mail/$groupName" ) {unlink("/var/spool/mail/$groupName") or ( $x = 255, warn "Failed to delete /var/spool/mail/$groupName.\n" );} }
 
 exit ($x);

root/etc/e-smith/events/actions/update-ifcfg

@@ -18,6 +18,15 @@ if (($c->get('EthernetDriver1')->value || 'unknown') eq 'dummy'){
 if (($c->get('InternalInterface')->prop('NICBonding') || 'disabled') eq 'enabled'){
   push @adapters, "bond\tbond\t10:00:01:02:03:04\tBonding virtual Interface\tbond0";
 }
+# if external VLAN is configured
+if (($c->get('ExternalInterface')->prop('VLAN') || 'disabled') ne 'disabled'){
+  my $name= ($c->get('ExternalInterface')->prop('Name') eq "ppp0") ? $c->get('pppoe')->prop('PhysicalInterface')  : $c->get('ExternalInterface')->prop('Name') ;
+  my $vlan=$c->get('ExternalInterface')->prop('VLAN');
+  $name=~ s/\.$vlan$//;
+  my ($newl) = grep ( /$name$/ , @adapters);
+  push @adapters, "$newl.$vlan";
+}
+#TODO if external virtual lan is configured
 
 # Expand templates for every adapters found
 foreach my $adapter (@adapters){

root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/01setupvlan

@@ -0,0 +1,10 @@
+{
+    $is_vlan = "no";
+    if ( ( exists $ExternalInterface{VLAN} && $ExternalInterface{VLAN} =~ /^\d+$/ ) && ($is_external || ( $ExternalInterface{Configuration} eq "pppoe") && $pppoe{PhysicalInterface}  eq $THIS_DEVICE ) )
+    {
+	$ifup_this_device = "yes";
+        $is_vlan = "yes";
+    }
+
+    "";
+}

root/etc/e-smith/templates/etc/sysconfig/network-scripts/ifcfg-ethX/75vlan

@@ -0,0 +1,4 @@
+{
+  return unless ($is_vlan eq  "yes");
+  $OUT = "VLAN=yes\n";
+}

root/etc/modules-load.d/vlan.conf

@@ -0,0 +1 @@
+8021q

root/usr/share/perl5/vendor_perl/esmith/console/configure.pm

@@ -559,9 +559,37 @@ ETHERNET_EXTERNAL:
         goto ETHERNET_EXTERNAL;
     }
 
+    goto ETHERNET_EXTERNAL_VLAN;# was SERVER_GATEWAY_DEDICATED;
+}
+#------------------------------------------------------------
+ETHERNET_EXTERNAL_VLAN:
+#------------------------------------------------------------
+{
+    ($rc, $choice) = $console->input_page
+        (
+         title  => gettext("Select External Interface VLAN"),
+         text   =>
+         gettext("Your ISP might have provided you a VLAN to use, if not leave empty."),
+         value   => $db->get_prop('ExternalInterface', 'VLAN') || ""
+        );
+
+    goto ETHERNET_EXTERNAL unless ($rc == 0);
+    # sanitize if a previous VLAN is present
+    my $extIF = $db->get_prop('ExternalInterface', 'Name');
+    $extIF =~  s/\.\d+$//;
+    if ( $choice =~ /^\d+$/ ) 
+    {
+       $db->set_prop('ExternalInterface', 'VLAN', $choice );
+       $db->set_prop('ExternalInterface', 'Name',  $extIF . ".$choice") unless $db->get_prop('ExternalInterface', 'Name') =~ /\.$choice$/; 
+    }
+    else 
+    {
+       $db->delete_prop('ExternalInterface', 'VLAN');
+       $db->set_prop('ExternalInterface', 'Name',$extIF);
+    }
+    
     goto SERVER_GATEWAY_DEDICATED;
 }
-
 #------------------------------------------------------------
 SERVER_GATEWAY_DEDICATED:
 #------------------------------------------------------------

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 16
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -184,6 +184,10 @@ fi
 
 
 %changelog
+* Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme
+- add vlan support on External Interface [SME: 12677]
+- fix typo [SME: 12763] 
+
 * Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
 -  add kernel module support for rp-pppoe plugin [SME: 12678]
    will allow faster fiber connexion when using multiple queue interface (RSS)