diff --git a/exec/lib/Http.php b/exec/lib/Http.php index e150946..4139049 100644 --- a/exec/lib/Http.php +++ b/exec/lib/Http.php @@ -71,7 +71,7 @@ final class Http return '' . '' . '' - . 'Serwer poczty' + . 'Zaloguj do serwera poczty' . '' @@ -84,8 +84,8 @@ final class Http $safe = htmlspecialchars($message, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); $body = '' . '' - . 'Serwer poczty' - . '

Serwer poczty

' . $safe . '

' + . 'Zaloguj do serwera poczty' + . '

Zaloguj do serwera poczty

' . $safe . '

' . ''; self::sendResponse($status, [ 'Content-Type' => 'text/html; charset=UTF-8', diff --git a/exec/lib/Settings.php b/exec/lib/Settings.php index f70dc96..904c8b6 100644 --- a/exec/lib/Settings.php +++ b/exec/lib/Settings.php @@ -3,8 +3,8 @@ declare(strict_types=1); final class Settings { - public const BASE_DIR = '/usr/local/hitme_plugins/mail-login'; - public const PLUGIN_DIR = '/usr/local/directadmin/plugins/mail-login'; + public const BASE_DIR = '/usr/local/hitme_plugins/mx_autologin'; + public const PLUGIN_DIR = '/usr/local/directadmin/plugins/mx_autologin'; public const SECRET_DIR = self::BASE_DIR . '/secrets'; public const LOG_DIR = self::BASE_DIR . '/logs'; public const STATE_DIR = self::BASE_DIR . '/state'; diff --git a/hooks/user_img.html b/hooks/user_img.html index 38cfba6..585500b 100644 --- a/hooks/user_img.html +++ b/hooks/user_img.html @@ -1 +1 @@ -Serwer poczty +Zaloguj do serwera poczty diff --git a/hooks/user_txt.html b/hooks/user_txt.html index 85e7833..61d3c41 100644 --- a/hooks/user_txt.html +++ b/hooks/user_txt.html @@ -1 +1 @@ -Serwer poczty +Zaloguj do serwera poczty diff --git a/images/user_icon.svg b/images/user_icon.svg index b14c434..4409bcd 100644 --- a/images/user_icon.svg +++ b/images/user_icon.svg @@ -1,4 +1,4 @@ - + diff --git a/plugin-settings.conf b/plugin-settings.conf index 329ee1b..5d77aab 100644 --- a/plugin-settings.conf +++ b/plugin-settings.conf @@ -1,6 +1,6 @@ # Ten plik jest runtime configuration pluginu. # Plugin czyta ustawienia bezpośrednio z: -# /usr/local/directadmin/plugins/mail-login/plugin-settings.conf +# /usr/local/directadmin/plugins/mx_autologin/plugin-settings.conf # Czy plugin jest domyślnie dostępny dla wszystkich użytkowników. DEFAULT_ENABLE=true @@ -42,8 +42,8 @@ MAIL_LOGIN_REMOTE_TRANSPORT=ssh MAIL_LOGIN_SSH_HOST=mx1.mojserwer.pl MAIL_LOGIN_SSH_PORT=22 MAIL_LOGIN_SSH_USER=root -MAIL_LOGIN_SSH_IDENTITY=/usr/local/hitme_plugins/mail-login/secrets/mx1_ed25519 -MAIL_LOGIN_SSH_KNOWN_HOSTS=/usr/local/hitme_plugins/mail-login/secrets/known_hosts +MAIL_LOGIN_SSH_IDENTITY=/usr/local/hitme_plugins/mx_autologin/secrets/mx1_ed25519 +MAIL_LOGIN_SSH_KNOWN_HOSTS=/usr/local/hitme_plugins/mx_autologin/secrets/known_hosts MAIL_LOGIN_CONNECT_TIMEOUT_SECONDS=5 # Limity bezpieczeństwa na źródłowym serwerze DirectAdmin. diff --git a/plugin.conf b/plugin.conf index 5f1fe24..e1f2f14 100644 --- a/plugin.conf +++ b/plugin.conf @@ -1,8 +1,8 @@ -name=mail-login -id=mail-login +name=MX-Autologin +id=mx_autologin type=user author=HITME.PL -version=1.0.12 +version=1.0.13 active=no installed=no user_run_as=root diff --git a/scripts/install.sh b/scripts/install.sh index 16706e0..d3b610e 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,8 +1,8 @@ #!/bin/sh set -eu -BASE_DIR="/usr/local/hitme_plugins/mail-login" -PLUGIN_DIR="/usr/local/directadmin/plugins/mail-login" +BASE_DIR="/usr/local/hitme_plugins/mx_autologin" +PLUGIN_DIR="/usr/local/directadmin/plugins/mx_autologin" mkdir -p "$BASE_DIR/secrets" "$BASE_DIR/logs" "$BASE_DIR/state/rate-limit" chmod 700 "$BASE_DIR/secrets" "$BASE_DIR/logs" "$BASE_DIR/state" "$BASE_DIR/state/rate-limit" @@ -14,4 +14,4 @@ fi touch "$BASE_DIR/logs/audit.log" chmod 600 "$BASE_DIR/logs/audit.log" -echo "mail-login installed; configuration is read from $PLUGIN_DIR/plugin-settings.conf" +echo "MX-Autologin installed; configuration is read from $PLUGIN_DIR/plugin-settings.conf" diff --git a/scripts/keygen.sh b/scripts/keygen.sh index b368d9a..1ababf1 100755 --- a/scripts/keygen.sh +++ b/scripts/keygen.sh @@ -1,11 +1,11 @@ #!/bin/sh set -eu -KEY_DIR="${MAIL_LOGIN_KEY_DIR:-/usr/local/hitme_plugins/mail-login/secrets}" +KEY_DIR="${MAIL_LOGIN_KEY_DIR:-/usr/local/hitme_plugins/mx_autologin/secrets}" KEY_NAME="${MAIL_LOGIN_KEY_NAME:-mx1_ed25519}" KEY_PATH="$KEY_DIR/$KEY_NAME" MX_MODE="${MX_LOGIN_MODE:-1}" -SETTINGS_FILE="${MAIL_LOGIN_SETTINGS_FILE:-/usr/local/directadmin/plugins/mail-login/plugin-settings.conf}" +SETTINGS_FILE="${MAIL_LOGIN_SETTINGS_FILE:-/usr/local/directadmin/plugins/mx_autologin/plugin-settings.conf}" HELPER_COMMAND="${MAIL_LOGIN_HELPER_COMMAND:-/usr/local/hitme_plugins/mail-login-helper/bin/create-login-url}" config_value() { @@ -154,7 +154,7 @@ chmod 700 "$KEY_DIR" if [ ! -f "$KEY_PATH" ]; then umask 077 - ssh-keygen -q -t ed25519 -a 100 -N "" -f "$KEY_PATH" -C "KLUCZ PLUGINU mail-autologin DLA SERWERA $SERVER_LABEL" + ssh-keygen -q -t ed25519 -a 100 -N "" -f "$KEY_PATH" -C "KLUCZ PLUGINU MX-Autologin DLA SERWERA $SERVER_LABEL" fi if [ ! -f "$KEY_PATH.pub" ]; then @@ -177,7 +177,7 @@ else AUTH_OPTIONS="$BASE_OPTIONS" fi -COMMENT="KLUCZ PLUGINU mail-autologin DLA SERWERA $SERVER_LABEL" +COMMENT="KLUCZ PLUGINU MX-Autologin DLA SERWERA $SERVER_LABEL" cat <'; echo ''; -echo 'Serwer poczty'; -echo '

Zaloguj do serwera poczty

'; +echo 'Zaloguj do serwera poczty'; +echo '

Zaloguj do serwera poczty

'; echo ''; diff --git a/user/login.raw b/user/login.raw index 3bae715..e1c9419 100755 --- a/user/login.raw +++ b/user/login.raw @@ -1,4 +1,4 @@ -#!/usr/local/bin/php -nc/usr/local/directadmin/plugins/mail-login/php.ini +#!/usr/local/bin/php -nc/usr/local/directadmin/plugins/mx_autologin/php.ini