sudo & logrotate правки

node/remnawave/init.sh

@@ -23,7 +23,7 @@ SITE_DIR="$SCRIPT_DIR/site"
 echo "SITE_DIR = $SITE_DIR"
 SITE_BAC_DIR="$SCRIPT_DIR/site_bac"
 echo "SITE_BAC_DIR = $SITE_BAC_DIR"
-CERT_DIR="$SITE_DIR/certs"
+CERT_DIR="$SCRIPT_DIR/certs"
 echo "CERT_DIR = $CERT_DIR"
 CERT_FILE="$CERT_DIR/certchain.pem"
 echo "CERT_FILE = $CERT_FILE"
@@ -116,8 +116,8 @@ echo "Ждём появления сертификатов..."
 
 for i in {1..120}; do
   if [ -s "$CERT_FILE" ] && [ -s "$KEY_FILE" ]; then
-    if openssl x509 -in "$CERT_FILE" -checkend 60 -noout >/dev/null 2>&1; then
-      if openssl pkey -in "$KEY_FILE" -noout >/dev/null 2>&1; then
+    if sudo openssl x509 -in "$CERT_FILE" -checkend 60 -noout >/dev/null 2>&1; then
+      if sudo openssl pkey -in "$KEY_FILE" -noout >/dev/null 2>&1; then
         echo "Сертификаты готовы!"
         break
       fi
@@ -127,7 +127,7 @@ for i in {1..120}; do
   sleep 2
 done
 
-if ! openssl x509 -in "$CERT_FILE" -checkend 60 -noout >/dev/null 2>&1; then
+if ! sudo openssl x509 -in "$CERT_FILE" -checkend 60 -noout >/dev/null 2>&1; then
   echo "ОШИБКА: Сертификаты не получены"
   exit 1
 fi
@@ -141,7 +141,6 @@ sudo mkdir -p $LOGROTATE_DIR
 TMP_LOGROTATE_CONF="$(mktemp)"
 cat > "$TMP_LOGROTATE_CONF" <<EOF
 "$LOG_DIR"/*.log {
-    daily
     size 50M
     rotate 10
     compress
@@ -164,7 +163,9 @@ else
 fi
 trap 'rm -rf "$TMP_LOGROTATE_CONF"' EXIT
 
-sudo logrotate -vf /etc/logrotate.d/remnanode
+sudo logrotate -vf $LOGROTATE_CONF
+
+rm -rm "$SCRIPT_DIR/nginx.conf.template"
 
 echo "Инициализация завершена успешно"
 rm -f -- "$SELF_PATH"