From ce244cfbc53add92a823b8a10c366552e9e2cf9f Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Fri, 16 Sep 2022 17:19:18 +0200
Subject: [PATCH] Fix wo secure --auth on Ubuntu 22.04

---
 README.md                    | 1 +
 wo/cli/plugins/secure.py     | 4 ++--
 wo/cli/plugins/stack_pref.py | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 24fdbe0..1d6c072 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@
 - **Modern** : Strong ciphers_suite, modern TLS protocols and HSTS support (Grade A+ on [ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=demo.wordops.eu&latest))
 - **Monitoring** : Live Nginx vhost traffic with ngx_vts_module and server monitoring with Netdata
 - **User Friendly** : WordOps dashboard with server status/monitoring and tools ([demo](https://demo.wordops.eu))
+- **Release cycle** : WordOps stable releases are published in June and December.
 
 ---
 
diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py
index 3b3079c..135ecfc 100644
--- a/wo/cli/plugins/secure.py
+++ b/wo/cli/plugins/secure.py
@@ -83,11 +83,11 @@ class WOSecureController(CementBaseController):
             if password == "":
                 pargs.user_pass = passwd
         Log.debug(self, "printf username:"
-                  "$(openssl passwd -crypt "
+                  "$(openssl passwd --apr1 "
                   "password 2> /dev/null)\n\""
                   "> /etc/nginx/htpasswd-wo 2>/dev/null")
         WOShellExec.cmd_exec(self, "printf \"{username}:"
-                             "$(openssl passwd -crypt "
+                             "$(openssl passwd -apr1 "
                              "{password} 2> /dev/null)\n\""
                              "> /etc/nginx/htpasswd-wo 2>/dev/null"
                              .format(username=pargs.user_input,
diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index 327f5b0..6cb4578 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -329,7 +329,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
                 try:
                     WOShellExec.cmd_exec(
                         self, "printf \"WordOps:"
-                        "$(openssl passwd -crypt "
+                        "$(openssl passwd -apr1 "
                         "{password} 2> /dev/null)\n\""
                         "> /etc/nginx/htpasswd-wo "
                         "2>/dev/null"