RHEL & 1:1 distro support (#2749)

* RHEL version checker

* use arch binary instead uname

* modify install script to support RHEL

* add support for RPM based distro

* add RPM repositories

* choose libdir depending on architecture

* common files for both debian and rhel

As @jaapmarcus raised concern to have common config files for both debian and rhel in github comment.

https://github.com/hestiacp/hestiacp/pull/2731#pullrequestreview-1030683914

This is initial commit to have a common base config files for both debian and rhel.

* Disable bats testing for branch

* architecture dependent result dir

* quota & linting for RHEL

* HestiaCP repo

* RHEL support in installer

Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>

Author: Ice Lake

.drone.yml

@@ -1,101 +1,3 @@
----
-kind: pipeline
-type: ssh
-name: Ubuntu | Nginx + Apache2  
-
-concurrency:
-  limit: 1
-
-server:
-  host:
-    from_secret: server_address
-  user: 
-    from_secret: username
-  ssh_key: 
-    from_secret: ssh_key
-
-platform:
-  os: linux
-  arch: amd64
-   
-steps:
-- name: Download submodules
-  image: alpine/git
-  commands:
-  - git submodule update --init --recursive
-- name: Build Hestia package and install
-  commands:
-  - ./src/hst_autocompile.sh --hestia --install '~localsrc'
-- name: Run system / user tests
-  commands:
-  - bats ./test/test.bats
-- name: Run restore tests
-  commands:
-  - bats ./test/restore.bats
-- name: Run config tests 
-  commands:
-  - bats ./test/config-tests.bats
-
-trigger:
-  event: [ pull_request, push ]
-  ref:
-  - refs/heads/staging/*
-  - refs/heads/beta
-  - refs/heads/release
-  - refs/heads/main
-  - refs/pull/*/head
-
----
-kind: pipeline
-type: ssh
-name: Debian | Nginx  
-
-concurrency:
-  limit: 1
-
-server:
-  host:
-    from_secret: server_address2
-  user: 
-    from_secret: username
-  ssh_key: 
-    from_secret: ssh_key
-
-platform:
-  os: linux
-  arch: amd64
-   
-steps:
-- name: Download submodules
-  image: alpine/git
-  commands:
-  - git submodule update --init --recursive
-- name: Build Hestia package install
-  commands:
-  - ./src/hst_autocompile.sh --hestia --install '~localsrc'
-- name: Run system / user tests
-  commands:
-  - bats ./test/test.bats
-- name: Run restore tests
-  commands:
-  - bats ./test/restore.bats
-- name: Run Letsencrypt test against Staging
-  commands:
-  - cp /root/le-env.sh /tmp/hestia-le-env.sh
-  - bats ./test/letsencrypt.bats
-- name: Run config tests 
-  commands:
-  - bats ./test/config-tests.bats
-  
-trigger:
-  event: [ pull_request, push ]
-  ref:
-  - refs/heads/staging/*
-  - refs/heads/beta
-  - refs/heads/release
-  - refs/heads/main
-  - refs/pull/*/head
-
 ---
 kind: pipeline
 type: docker
@@ -123,54 +25,7 @@ trigger:
       - refs/heads/main
       - refs/pull/*/head
 
----
-kind: pipeline
-type: docker
-name: Push to beta atp server
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: Build
-    image: debian:bullseye
-    commands:
-    - ln -snf /etc/localtime && echo CET > /etc/timezone
-    - ./src/hst_autocompile.sh --dontinstalldeps --hestia --debug --cross --noinstall --keepbuild --debug '~localsrc'
-    - mkdir -p ./hestia/
-    - mv /tmp/hestiacp-src/deb/*.deb ./hestia/
-  - name: Upload
-    image: appleboy/drone-scp
-    settings:
-      host:
-        from_secret: apt_server
-      user: root
-      key:
-        from_secret: ssh_key
-      port: 22
-      command_timeout: 2m
-      target: /root/
-      source:
-        - ./hestia/*
-  - name: Publish
-    image: appleboy/drone-ssh
-    settings:
-        host:
-          from_secret: apt_server
-        user: root
-        key:
-          from_secret: ssh_key
-        port: 22
-        command_timeout: 2m
-        script:
-            - freight-add ./hestia/*.deb apt/bionic apt/focal apt/jammy apt/stretch apt/buster apt/bullseye
-            - freight-cache
-            - rm -fr ./hestia/
-  
-trigger:
-    event: [ promote] 
 
 ---
 kind: signature
-hmac: a191a477aa337f2efff534022164906ff20ef2b6340ec808d128c09a06d7eaa3
+hmac: 4eec34ee92f63737d6a976140e6e54adf637ebbb4836b17a083c560a4440c54f

bin/v-add-backup-host

@@ -21,7 +21,7 @@ path=${5-/backup}
 port=$6
 
 # CPU Architecture
-arch=$(uname -m)
+arch=$(arch)
 
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh

bin/v-add-firewall-ipset

@@ -44,7 +44,11 @@ IPSET_PATH="$HESTIA/data/firewall/ipset"
 
 # Ensure ipset is installed
 if [ -z "$IPSET_BIN" ]; then
-    apt-get --quiet --yes install ipset > /dev/null
+    if [ -f '/etc/redhat-release' ]; then
+        dnf install -q -y ipset > /dev/null
+    else
+        apt-get --quiet --yes install ipset > /dev/null
+    fi
     check_result $? "Installing ipset package"
 
     IPSET_BIN="$(which ipset)"

bin/v-add-sys-quota

@@ -35,14 +35,13 @@ fi
 # Checking quota package
 quota=$(which --skip-alias --skip-functions quota 2>/dev/null)
 if [ $? -ne 0 ]; then
-    if [ -d "/etc/sysconfig" ]; then
-        yum -y install quota >/dev/null 2>&1
-        check_result $? "quota package installation failed" "$E_UPDATE"
+    if [ -f "/etc/redhat-release" ]; then
+        dnf -y install quota >/dev/null 2>&1
     else
         export DEBIAN_FRONTEND=noninteractive
         apt-get -y install quota >/dev/null 2>&1
-        check_result $? "quota package installation failed" "$E_UPDATE"
     fi
+    check_result $? "quota package installation failed" "$E_UPDATE"
 fi
 
 # Perform verification if read-only mode is enabled

bin/v-add-web-php

@@ -84,8 +84,13 @@ if ! echo "$DB_SYSTEM" | grep -w 'pgsql' >/dev/null; then
 fi
 
 # Install php packages
-apt-get -qq update
-apt-get -y -qq -o Dpkg::Options::="--force-confold" install $mph > /dev/null 2>&1 &
+if [ -f '/etc/redhat-release' ]; then
+    dnf makecache -q
+    dnf install -q -y $mph > /dev/null 2>&1 &
+else
+    apt-get -qq update
+    apt-get -y -qq -o Dpkg::Options::="--force-confold" install $mph > /dev/null 2>&1 &
+fi
 BACK_PID=$!
 
 # Check if package installation is done, print a spinner
@@ -103,7 +108,11 @@ echo
 # Check if installation was successful
 if [ ! -f "$php_fpm" ]; then
     echo "ERROR: Installation failed, please run the following command manually for debugging:"
-    echo "apt-get install $mph"
+    if [ -f '/etc/redhat-release' ]; then
+        echo "dnf install $mph"
+    else
+        echo "apt-get install $mph"
+    fi
 fi
 
 # Check if required modules for apache2 are enabled

bin/v-delete-firewall-ipset

@@ -42,7 +42,11 @@ check_hestia_demo_mode
 
 # Install ipset package if missing
 if [ -z "$IPSET_BIN" ]; then
-    apt-get --quiet --yes install ipset > /dev/null
+    if [ -f '/etc/redhat-release' ]; then
+        dnf install -q -y ipset > /dev/null
+    else
+        apt-get --quiet --yes install ipset > /dev/null
+    fi
     check_result $? "Installing ipset package"
 
     IPSET_BIN="$(which ipset)"

bin/v-delete-web-php

@@ -71,7 +71,11 @@ if [[ `echo "$version 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
 fi
 
 # Purge php packages
-apt-get -y purge $mph > /dev/null 2>&1 &
+if [ -f '/etc/redhat-release' ]; then
+    dnf remove -y $mph > /dev/null 2>&1 &
+else
+    apt-get -y purge $mph > /dev/null 2>&1 &
+fi
 BACK_PID=$!
 
 # Check if package removal is done, print a spinner
@@ -89,7 +93,11 @@ echo
 # Check if installation was successfully
 if [ -f "$php_fpm" ]; then
     echo "ERROR: Uninstallation failed, please run the following command manually for debugging:"
-    echo "apt-get purge $mph"
+    if [ -f '/etc/redhat-release' ]; then
+        echo "dnf remove $mph"
+    else
+        echo "apt-get purge $mph"
+    fi
     exit 1; 
 fi
 

bin/v-list-sys-hestia-updates

@@ -23,6 +23,25 @@ source_conf "$HESTIA/conf/hestia.conf"
 
 fields="\$NAME \$VERSION \$ARCH \$UPDATED \$DESCR \$TIME \$DATE"
 
+# Check details of installed .deb package function
+check_installed_deb() {
+    dpkg_data=$(dpkg-query -s $1)
+    pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/$1.list)
+    ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
+    VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
+    DATE=$(date -d @$pkg_date +"%F")
+    TIME=$(date -d @$pkg_date +"%T")
+}
+
+# Check details of installed .rpm package function
+check_installed_rpm() {
+    rpm_data=$(rpm -qi $1)
+    ARCH=$(echo "$rpm_data"|grep Architecture |cut -f 2 -d ' ')
+    VERSION=$(echo "$rpm_data"|grep Version |cut -f 2 -d ':' | xargs)
+    DATE=$(echo "$rpm_data"| grep "Build Date"| awk '{print $5 " " $6 " " $7}')
+    TIME=$(echo "$rpm_data"| grep "Build Date"| awk '{print $8 " " $9 " " $10}')
+}
+
 # JSON list function
 json_list() {
     IFS=$'\n'
@@ -65,17 +84,22 @@ shell_list() {
 #----------------------------------------------------------#
 
 # Checking official latest version
-hestia_v=$(apt-cache policy hestia | grep Candidate | cut -d ':' -f 2 | xargs)
-nginx_v=$(apt-cache policy hestia-nginx | grep Candidate | cut -d ':' -f 2 | xargs)
-php_v=$(apt-cache policy hestia-php | grep Candidate | cut -d ':' -f 2 | xargs)
+if [ -f '/etc/redhat-release' ]; then
+    hestia_v=$(dnf list hestia | grep hestia | awk '{print $2}' | cut -f 1 -d '-')
+    nginx_v=$(dnf list hestia-nginx | grep hestia-nginx | awk '{print $2}' | cut -f 1 -d '-')
+    php_v=$(dnf list hestia-php | grep hestia-php | awk '{print $2}' | cut -f 1 -d '-')
+else
+    hestia_v=$(apt-cache policy hestia | grep Candidate | cut -d ':' -f 2 | xargs)
+    nginx_v=$(apt-cache policy hestia-nginx | grep Candidate | cut -d ':' -f 2 | xargs)
+    php_v=$(apt-cache policy hestia-php | grep Candidate | cut -d ':' -f 2 | xargs)
+fi
 
 # Checking installed hestia version
-dpkg_data=$(dpkg-query -s hestia)
-pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia.list)
-ARCH=$(echo "$dpkg_data"|grep Architecture |cut -f 2 -d ' ')
-VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
-DATE=$(date -d @$pkg_date +"%F")
-TIME=$(date -d @$pkg_date +"%T")
+if [ -f '/etc/redhat-release' ]; then
+    check_installed_rpm hestia
+else
+    check_installed_deb hestia
+fi
 
 UPDATED='yes'
 if [ -n "$hesta_v" ] && [ "$hestia_v" \> "$VERSION" ]; then
@@ -86,12 +110,11 @@ data="NAME='hestia' VERSION='$VERSION' ARCH='$ARCH'"
 data="$data UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'"
 
 # Checking installed hestia-php version
-dpkg_data=$(dpkg-query -s hestia-php)
-pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-php.list)
-ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
-VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
-DATE=$(date -d @$pkg_date +"%F")
-TIME=$(date -d @$pkg_date +"%T")
+if [ -f '/etc/redhat-release' ]; then
+    check_installed_rpm hestia-php
+else
+    check_installed_deb hestia-php
+fi
 
 UPDATED='yes'
 if [ -n "$php_v" ] && [ "$php_v" \> "$VERSION" ]; then
@@ -103,12 +126,11 @@ data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='php interpreter'"
 data="$data TIME='$TIME' DATE='$DATE'"
 
 # Checking installed hestia-nginx version
-dpkg_data=$(dpkg-query -s hestia-nginx)
-pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-nginx.list)
-ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
-VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
-DATE=$(date -d @$pkg_date +"%F")
-TIME=$(date -d @$pkg_date +"%T")
+if [ -f '/etc/redhat-release' ]; then
+    check_installed_rpm hestia-nginx
+else
+    check_installed_deb hestia-nginx
+fi
 
 UPDATED='yes'
 if [ -n "$nginx_v" ] && [ "$nginx_v" \> "$VERSION" ]; then

bin/v-update-sys-hestia-git

@@ -78,7 +78,7 @@ BUILD_DIR='/tmp/hestiacp-src'
 DEB_DIR="$BUILD_DIR/debs"
 INSTALL_DIR='/usr/local/hestia'
 ARCHIVE_DIR="${BUILD_DIR}/archive"
-architecture="$(uname -m)"
+architecture="$(arch)"
 if [ $architecture == 'aarch64' ]; then
     BUILD_ARCH='arm64'
 else