Merge pull request 'Bump version & Debian 12 patch' (#95 ) from unstable into master

Reviewed-on: #95
Update changelog for release
2024-04-22 10:41:13 +02:00 · 2024-04-16 18:02:46 +02:00 · 2024-04-16 18:01:24 +02:00 · 2024-04-16 17:59:01 +02:00 · 2024-04-16 17:55:08 +02:00 · 2024-04-03 16:28:57 +02:00
3 changed files with 27 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -12,6 +12,20 @@ The **patch** part changes is incremented if multiple releases happen the same m

 ### Added

+### Changed
+
+### Fixed
+
+### Removed
+
+### Security
+
+
+
+## [24.04]
+
+### Added
+
 * Prevent op_del to fail and able to remove web account when part of it is already removed

 ### Changed
@ -20,6 +34,9 @@ The **patch** part changes is incremented if multiple releases happen the same m

 ### Fixed

+* letsencrypt: Add required check when retrieving certificate. (Avoid TypeError.)
+* web-add.sh: Fix ssh group membership (#94)
+
 ### Removed

 ### Security
--- a/lib/letsencrypt.php
+++ b/lib/letsencrypt.php
@ -157,6 +157,9 @@ class LetsEncrypt
    {
        $stream = stream_context_create(array("ssl" => array("capture_peer_cert" => true)));
        $read = stream_socket_client("ssl://" . $domain . ":443", $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $stream);
+        if ($read === false) {
+            return false;
+        }
        $cont = stream_context_get_params($read);
        
        return $cont;
--- a/scripts/web-add.sh
+++ b/scripts/web-add.sh
@ -14,7 +14,7 @@

 set -e

-VERSION="23.02"
+VERSION="24.04"
 HOME="/root"
 CONTACT_MAIL="jdoe@example.org"
 WWWBOUNCE_MAIL="jdoe@example.org"
@ -363,14 +363,12 @@ create_www_account() {
        lxc-attach -n php"${php_version}" -- /usr/sbin/adduser --disabled-password --home "$HOME_DIR_USER"/www --no-create-home --shell /bin/false --gecos "WWW $in_login" www-"$in_login" --uid "$www_uid" --ingroup "$in_login" --force-badname >/dev/null
    done

-    if grep -qE '^AllowGroups' /etc/ssh/sshd_config; then
-        if ! grep -qE "^AllowGroups(\\s+\\S+)*(\\s+$SSH_GROUP)" /etc/ssh/sshd_config; then
-            sed -i "s/^AllowGroups .*/& $SSH_GROUP/" /etc/ssh/sshd_config
-            groupadd --force $SSH_GROUP
-        fi
-        usermod -a -G $SSH_GROUP "$in_login"
-    elif grep -qE '^AllowUsers' /etc/ssh/sshd_config; then
+    if grep -qE '^AllowUsers' /etc/ssh/sshd_config; then
        sed -i "s/^AllowUsers .*/& $in_login/" /etc/ssh/sshd_config
+    else
+        if getent group "$SSH_GROUP" 1>/dev/null 2>&1; then
+            usermod --append --groups "$SSH_GROUP" "$in_login"
+	fi
    fi
    /etc/init.d/ssh reload

@ -766,7 +764,7 @@ op_del() {

    # Deactivate web vhost (apache or nginx)
    if [ "$WEB_SERVER" == "apache" ]; then
-        if a2query -s test12 >/dev/null 2&>1; then
+        if a2query -s "${login}" >/dev/null 2&>1; then
            a2dissite "${login}.conf"
        fi
        rm -f /etc/apache2/sites-available/"$login.conf"
Author	SHA1	Message	Date
Ludovic Poujol	3400434f90	Merge pull request 'Bump version & Debian 12 patch' (#95 ) from unstable into master Reviewed-on: #95	2024-04-22 10:41:13 +02:00
Ludovic Poujol	a7c1af3d83	Update changelog for release	2024-04-16 18:02:46 +02:00
Ludovic Poujol	188e63376d	Bump version	2024-04-16 18:01:24 +02:00
Ludovic Poujol	a30ba3337b	Update CHANGELOG.md * web-add.sh: Fix ssh group membership (#94)	2024-04-16 17:59:01 +02:00
Ludovic Poujol	b014f1584a	Merge pull request 'Fix ssh group membership.' (#94 ) from fix-ssh-memebership into unstable Reviewed-on: #94	2024-04-16 17:55:08 +02:00
Brice Waegeneire	99741826f6	Fix ssh group membership. We now use split SSH configuration files, so the user was never a member of the ssh group on newly installed systems. This change don't modify the SSH configuration of new systems since evolinux-ssh members' are already allowed to connect by SSH.	2024-04-03 16:28:57 +02:00
Mathieu Trossevin	5a22490dc8	Merge pull request 'Fixes' (#90 ) from unstable into master Reviewed-on: #90	2023-12-06 10:49:02 +01:00
William Hirigoyen	95108897b0	Fix remaining test	2023-12-01 17:15:35 +01:00
Mathieu Trossevin	fd0f03ab05	Merge pull request 'fix(letsencrypt): check for false as to avoid TypeError' (#84 ) from fix-letsencrypt into unstable Reviewed-on: #84	2023-11-30 16:36:16 +01:00
whirigoyen	93c9e450ff	Merge pull request 'sendmail_path in LXC, and better op_del' (#85 ) from unstable into master Reviewed-on: #85 Reviewed-by: Mathieu Trossevin <mtrossevin@noreply.gitea.evolix.org>	2023-11-30 15:53:07 +01:00
Mathieu Trossevin	2b6b76b78d	Update changelog	2023-11-17 14:39:42 +01:00
Mathieu Trossevin	21eef58a96	Merge branch 'unstable' into fix-letsencrypt	2023-11-17 14:34:16 +01:00
Mathieu Trossevin	9419242465	fix(letsencrypt): check for false as to avoid TypeError	2023-10-31 10:04:02 +01:00