diff --git a/README.md b/README.md index 3cfe850..4fddc6a 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ ssh root@your.server Download the installation script for the latest release: ```bash -wget https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh +wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh ``` If the download fails due to an SSL validation error, please be sure you've installed the ca-certificate package on your system - you can do this with the following command: diff --git a/bin/v-change-sys-api b/bin/v-change-sys-api index 92da649..db01a9b 100755 --- a/bin/v-change-sys-api +++ b/bin/v-change-sys-api @@ -39,9 +39,9 @@ check_hestia_demo_mode if [ "$status" = "enable" ]; then if [ ! -f "$HESTIA/web/api/index.php" ]; then # Avoid useng RELEASE_BRANCH - wget -q https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/api/index.php -O $HESTIA/web/api/index.php + wget -q https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/api/index.php -O $HESTIA/web/api/index.php if [ ! -s "$HESTIA/web/api/index.php" ]; then - wget -q https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/api/index.php -O $HESTIA/web/api/index.php + wget -q https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/api/index.php -O $HESTIA/web/api/index.php if [ ! -s "$HESTIA/web/api/index.php" ]; then # Throw error message to user echo "ERROR: API installation failed." diff --git a/bin/v-change-sys-release b/bin/v-change-sys-release index aae514d..4e58bd7 100755 --- a/bin/v-change-sys-release +++ b/bin/v-change-sys-release @@ -49,7 +49,7 @@ if [ -z "$branch" ]; then else # Check that requested branch exists echo "Checking for existence of $branch branch..." - branch_check=$(curl -s --head -w %{http_code} "https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/src/rpm/hestia/control" -o /dev/null) + branch_check=$(curl -s --head -w %{http_code} "https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/src/rpm/hestia/control" -o /dev/null) if [ "$branch_check" -ne "200" ]; then echo "Error: invalid branch name specified." exit 1 diff --git a/bin/v-update-white-label-logo b/bin/v-update-white-label-logo index d6aaa26..fbee76e 100755 --- a/bin/v-update-white-label-logo +++ b/bin/v-update-white-label-logo @@ -30,31 +30,31 @@ source_conf "$HESTIA/conf/hestia.conf" if [ -f "$HESTIA/web/images/custom/logo.svg" ]; then cp -f $HESTIA/web/images/custom/logo.svg $HESTIA/web/images/logo.svg elif [ ! -f "$HESTIA/web/images/custom/logo.svg" ] && [ "$download" = "yes" ]; then - download_file https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/images/logo.svg $HESTIA/web/images/logo.svg + download_file https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/images/logo.svg $HESTIA/web/images/logo.svg fi if [ -f "$HESTIA/web/images/custom/logo.png" ]; then cp -f $HESTIA/web/images/custom/logo.png $HESTIA/web/images/logo.png elif [ ! -f "$HESTIA/web/images/custom/logo.png" ] && [ "$download" = "yes" ]; then - download_file https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/images/logo.png $HESTIA/web/images/logo.png + download_file https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/images/logo.png $HESTIA/web/images/logo.png fi if [ -f "$HESTIA/web/images/custom/logo-header.svg" ]; then cp -f $HESTIA/web/images/custom/logo-header.svg $HESTIA/web/images/logo-header.svg elif [ ! -f "$HESTIA/web/images/custom/logo-header.svg" ] && [ "$download" = "yes" ]; then - download_file https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/images/logo-header.svg $HESTIA/web/images/logo-header.svg + download_file https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/images/logo-header.svg $HESTIA/web/images/logo-header.svg fi if [ -f "$HESTIA/web/images/custom/favicon.png" ]; then cp -f $HESTIA/web/images/custom/favicon.png $HESTIA/web/images/favicon.png elif [ ! -f "$HESTIA/web/images/custom/favicon.png" ] && [ "$download" = "yes" ]; then - download_file https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/images/favicon.png $HESTIA/web/images/favicon.png + download_file https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/images/favicon.png $HESTIA/web/images/favicon.png fi if [ -f "$HESTIA/web/images/custom/favicon.ico" ]; then cp -f $HESTIA/web/images/custom/favicon.ico $HESTIA/web/favicon.ico elif [ ! -f "$HESTIA/web/images/custom/favicon.ico" ] && [ "$download" = "yes" ]; then - download_file https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/web/favicon.ico $HESTIA/web/favicon.ico + download_file https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/web/favicon.ico $HESTIA/web/favicon.ico fi #----------------------------------------------------------# diff --git a/docs/.vitepress/theme/components/InstallOptions.vue b/docs/.vitepress/theme/components/InstallOptions.vue index 07657ad..58b9d7b 100644 --- a/docs/.vitepress/theme/components/InstallOptions.vue +++ b/docs/.vitepress/theme/components/InstallOptions.vue @@ -13,7 +13,7 @@ export default { return { pageloader: false, hestia_wget: - "wget https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh", + "wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh", hestia_install: "sudo bash hst-install.sh", installStr: "", }; diff --git a/docs/docs/introduction/getting-started.md b/docs/docs/introduction/getting-started.md index 343169a..234ad79 100644 --- a/docs/docs/introduction/getting-started.md +++ b/docs/docs/introduction/getting-started.md @@ -43,7 +43,7 @@ Interactive installer that will install the default Hestia software configuratio Download the installation script for the latest release: ```bash -wget https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh +wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh ``` If the download fails due to an SSL validation error, please be sure you've installed the ca-certificate package on your system - you can do this with the following command: diff --git a/func/domain.sh b/func/domain.sh index ef94b43..298e592 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -108,8 +108,12 @@ prepare_web_backend() { pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;) fi # Check if multiple-PHP installed - regex="socket-(\d+)_(\d+)" - if [[ $backend_template =~ ^.*PHP-([0-9])\_([0-9])$ ]]; then + if [ -f "/etc/redhat-release" ]; then + regex="^.*PHP-([0-9])([0-9])$" + else + regex="^.*PHP-([0-9])\_([0-9])$" + fi + if [[ $backend_template =~ $regex ]]; then if [ -f "/etc/redhat-release" ]; then backend_version="${BASH_REMATCH[1]}${BASH_REMATCH[2]}" pool=$(find -L /etc/opt/remi/php$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \)) diff --git a/func/main.sh b/func/main.sh index e35e5c4..6105294 100644 --- a/func/main.sh +++ b/func/main.sh @@ -28,7 +28,7 @@ MAILTPL=$HESTIA/data/templates/mail DNSTPL=$HESTIA/data/templates/dns RRD=$HESTIA/web/rrd SENDMAIL="$HESTIA/web/inc/mail-wrapper.php" -HESTIA_GIT_REPO="https://dev.putey.net/bayrepo/hestiacp" +HESTIA_GIT_REPO="https://dev.brepo.ru/bayrepo/hestiacp" HESTIA_THEMES="$HESTIA/web/css/themes" HESTIA_THEMES_CUSTOM="$HESTIA/web/css/themes/custom" SCRIPT="$(basename $0)" diff --git a/install/hst-install-rhel.sh b/install/hst-install-rhel.sh index 70aaebf..3430563 100755 --- a/install/hst-install-rhel.sh +++ b/install/hst-install-rhel.sh @@ -679,7 +679,7 @@ echo # Installing Nginx repo echo "[ * ] NGINX" -dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/nginx/nginx.repo +dnf config-manager --add-repo https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/rpm/nginx/nginx.repo # Installing Remi PHP repo echo "[ * ] PHP" @@ -688,7 +688,7 @@ dnf install -y https://rpms.remirepo.net/enterprise/remi-release-$release.rpm # Installing MariaDB repo if [ "$mysql" = 'yes' ]; then echo "[ * ] MariaDB" - dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/mysql/mariadb-$(arch).repo + dnf config-manager --add-repo https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/rpm/mysql/mariadb-$(arch).repo fi # Enabling MySQL module @@ -701,9 +701,9 @@ fi # Installing HestiaCP repo echo "[ * ] Hestia Control Panel" -dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/hestia/hestia.repo -rpm --import https://repo.putey.net/repo/gpgkeys/repo.putey.net.pub -check_result $? "rpm import putey.net GPG key failed" +dnf config-manager --add-repo https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/rpm/hestia/hestia.repo +rpm --import https://repo.brepo.ru/repo/gpgkeys/repo.brepo.ru.pub +check_result $? "rpm import brepo.ru GPG key failed" mkdir /var/cache/hestia-nginx/ chown admin:admin /var/cache/hestia-nginx/ diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh index 47b4f6c..3382981 100755 --- a/install/hst-install-ubuntu.sh +++ b/install/hst-install-ubuntu.sh @@ -434,7 +434,7 @@ fi # Validate whether installation script matches release version before continuing with install if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then - release_branch_ver=$(curl -s https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/src/deb/hestia/control | grep "Version:" | awk '{print $2}') + release_branch_ver=$(curl -s https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/src/deb/hestia/control | grep "Version:" | awk '{print $2}') if [ "$HESTIA_INSTALL_VER" != "$release_branch_ver" ]; then echo echo -e "\e[91mInstallation aborted\e[0m" @@ -442,7 +442,7 @@ if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then echo -e "\e[33mERROR: Install script version does not match package version!\e[0m" echo -e "\e[33mPlease download the installer from the release branch in order to continue:\e[0m" echo "" - echo -e "\e[33mhttps://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh\e[0m" + echo -e "\e[33mhttps://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh\e[0m" echo "" echo -e "\e[33mTo test pre-release versions, build the .deb packages and re-run the installer:\e[0m" echo -e " \e[33m./hst_autocompile.sh \e[1m--hestia branchname no\e[21m\e[0m" diff --git a/install/hst-install.sh b/install/hst-install.sh index f8c7bda..193f112 100755 --- a/install/hst-install.sh +++ b/install/hst-install.sh @@ -90,7 +90,7 @@ check_wget_curl() { # Check wget if [ -e '/usr/bin/wget' ]; then if [ -e '/etc/redhat-release' ]; then - wget -q https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install-rhel.sh -O hst-install-rhel.sh + wget -q https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install-rhel.sh -O hst-install-rhel.sh if [ "$?" -eq '0' ]; then bash hst-install-rhel.sh $* exit @@ -99,7 +99,7 @@ check_wget_curl() { exit 1 fi else - wget -q https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install-$type.sh -O hst-install-$type.sh + wget -q https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install-$type.sh -O hst-install-$type.sh if [ "$?" -eq '0' ]; then bash hst-install-$type.sh $* exit @@ -113,7 +113,7 @@ check_wget_curl() { # Check curl if [ -e '/usr/bin/curl' ]; then if [ -e '/etc/redhat-release' ]; then - curl -s -O https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install-rhel.sh + curl -s -O https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install-rhel.sh if [ "$?" -eq '0' ]; then bash hst-install-rhel.sh $* exit @@ -122,7 +122,7 @@ check_wget_curl() { exit 1 fi else - curl -s -O https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install-$type.sh + curl -s -O https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install-$type.sh if [ "$?" -eq '0' ]; then bash hst-install-$type.sh $* exit diff --git a/install/rpm/hestia/hestia.repo b/install/rpm/hestia/hestia.repo index cf9395b..e906e5b 100644 --- a/install/rpm/hestia/hestia.repo +++ b/install/rpm/hestia/hestia.repo @@ -1,7 +1,7 @@ [hestiacp] -name=msvsphere9 repo on repo.putey.net -comment=msvsphere9 repo on repo.putey.net -baseurl=https://repo.putey.net/repo/msvsphere9_preprod +name=msvsphere9 repo on repo.brepo.ru +comment=msvsphere9 repo on repo.brepo.ru +baseurl=https://repo.brepo.ru/repo/msvsphere9_preprod enabled=1 -gpgkey=https://repo.putey.net/repo/gpgkeys/repo.putey.net.pub +gpgkey=https://repo.brepo.ru/repo/gpgkeys/repo.brepo.ru.pub gpgcheck=1 \ No newline at end of file diff --git a/src/hst_bootstrap_install.sh b/src/hst_bootstrap_install.sh index 83ee1ed..a3ac95d 100755 --- a/src/hst_bootstrap_install.sh +++ b/src/hst_bootstrap_install.sh @@ -11,11 +11,11 @@ os=$3 # Download specified installer and compiler if [ -f "/etc/redhat-release" ]; then - wget https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install-rhel.sh + wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install-rhel.sh else - wget https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/hst-install-$os.sh + wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install-$os.sh fi -wget https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/src/hst_autocompile.sh +wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/src/hst_autocompile.sh # Execute compiler and build hestia core package chmod +x hst_autocompile.sh diff --git a/src/lxd_compile.sh b/src/lxd_compile.sh index 200277d..a0cb4da 100644 --- a/src/lxd_compile.sh +++ b/src/lxd_compile.sh @@ -8,7 +8,7 @@ else apt -y install curl wget fi -curl https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/src/hst_autocompile.sh > /tmp/hst_autocompile.sh +curl https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/src/hst_autocompile.sh > /tmp/hst_autocompile.sh chmod +x /tmp/hst_autocompile.sh mkdir -p /opt/hestiacp diff --git a/test/make-test-containers.php b/test/make-test-containers.php index 344e12d..f5c4bda 100644 --- a/test/make-test-containers.php +++ b/test/make-test-containers.php @@ -259,7 +259,7 @@ function getHestiaVersion($branch) { $control_file = file_get_contents(SHARED_HOST_FOLDER . "/hestiacp/src/rpm/hestia/control"); } else { $control_file = file_get_contents( - "https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/src/rpm/hestia/control", + "https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/src/rpm/hestia/control", ); }