diff --git a/contriborbase b/contriborbase deleted file mode 100644 index ef36a67..0000000 --- a/contriborbase +++ /dev/null @@ -1 +0,0 @@ -sme10 diff --git a/root/etc/e-smith/tests/configuration.conf b/root/etc/e-smith/tests/configuration.conf index 8588f36..def0121 100644 --- a/root/etc/e-smith/tests/configuration.conf +++ b/root/etc/e-smith/tests/configuration.conf @@ -73,7 +73,6 @@ ipsec=service|InitscriptOrder|90|PubKey|0sAQOoIKaOMuDqSdCZJXgv9QI86DAuAwbbvn8uoK isdn=service|Protocol|2|UseSyncPPP|yes|status|disabled keytable=service|InitscriptOrder|25|status|enabled ldap=service|InitscriptOrder|80|access|private|defaultCity|Ottawa|defaultCompany|XYZ Corporation|defaultDepartment|Main|defaultPhoneNumber|555-5555|defaultStreet|123 Main Street|status|enabled -lilo=service|AddressMode|linear local=service|InitscriptOrder|99|status|enabled lpd=service|InitscriptOrder|60|status|enabled mariadb=service|InitscriptOrder|90|status|enabled @@ -83,10 +82,9 @@ mysql.init=service|InitscriptOrder|99|status|enabled named=service|chroot|yes|status|enabled network=service|InitscriptOrder|10|status|enabled ntpd=service|InitscriptOrder|55|status|disabled -php=service|status|enabled +php=configuration|status|enabled popd=service|access|private|status|enabled pppoe=service|DemandIdleTime|no|InitscriptOrder|57|SynchronousPPP|no|status|disabled -pptpd=service|sessions|10|status|disabled qmail=service|InitscriptOrder|80|status|enabled random=service|InitscriptOrder|20|status|enabled rsyslog=service|InitscriptOrder|05|status|enabled @@ -98,5 +96,6 @@ sshd=service|InitscriptOrder|85|PasswordAuthentication|yes|PermitRootLogin|yes|a sync=service|Host|service.e-smith.com|LastId|0|SuccessId|0|SyncFrequency|1|SyncMinute|57|status|disabled telnet=service|access|private|status|disabled testing=service|destruction|1 +vpn=configuration|sessions|10|status|disabled wibble=42 xinetd=service|InitscriptOrder|50|status|enabled diff --git a/smeserver-test.spec b/smeserver-test.spec index ee5115a..de75c2a 100644 --- a/smeserver-test.spec +++ b/smeserver-test.spec @@ -4,7 +4,7 @@ Summary: smeserver server and gateway - testing infrastructure module %define name smeserver-test Name: %{name} %define version 11.0.0 -%define release 4 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -25,6 +25,9 @@ Provides: e-smith-test smeserver server and gateway software - testing infrastructure module. %changelog +* Wed Feb 12 2025 Jean-Philippe Pialasse 11.0.0-5.sme +- move pptpd to vpn [SME: 11416] + * Wed Apr 17 2024 Jean-Philippe Pialasse 11.0.0-4.sme - rename update event