bayrepo/hestiacp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from putey.net to brepo.ru

Browse Source
This commit is contained in:
Alexey Berezhok
2024-08-20 13:36:11 +03:00
parent ea246929e6
commit 9b8f6f89fa
15 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -70,7 +70,7 @@ ssh root@your.server
Download the installation script for the latest release: Download the installation script for the latest release:
```bash ```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: 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:

4
bin/v-change-sys-api
View File

@@ -39,9 +39,9 @@ check_hestia_demo_mode
if [ "$status" = "enable" ]; then if [ "$status" = "enable" ]; then
if [ ! -f "$HESTIA/web/api/index.php" ]; then if [ ! -f "$HESTIA/web/api/index.php" ]; then
# Avoid useng RELEASE_BRANCH # 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 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 if [ ! -s "$HESTIA/web/api/index.php" ]; then
# Throw error message to user # Throw error message to user
echo "ERROR: API installation failed." echo "ERROR: API installation failed."

2
bin/v-change-sys-release
View File

@@ -49,7 +49,7 @@ if [ -z "$branch" ]; then
else else
# Check that requested branch exists # Check that requested branch exists
echo "Checking for existence of $branch branch..." 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 if [ "$branch_check" -ne "200" ]; then
echo "Error: invalid branch name specified." echo "Error: invalid branch name specified."
exit 1 exit 1

10
bin/v-update-white-label-logo
View File

@@ -30,31 +30,31 @@ source_conf "$HESTIA/conf/hestia.conf"
if [ -f "$HESTIA/web/images/custom/logo.svg" ]; then if [ -f "$HESTIA/web/images/custom/logo.svg" ]; then
cp -f $HESTIA/web/images/custom/logo.svg $HESTIA/web/images/logo.svg cp -f $HESTIA/web/images/custom/logo.svg $HESTIA/web/images/logo.svg
elif [ ! -f "$HESTIA/web/images/custom/logo.svg" ] && [ "$download" = "yes" ]; then 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 fi
if [ -f "$HESTIA/web/images/custom/logo.png" ]; then if [ -f "$HESTIA/web/images/custom/logo.png" ]; then
cp -f $HESTIA/web/images/custom/logo.png $HESTIA/web/images/logo.png cp -f $HESTIA/web/images/custom/logo.png $HESTIA/web/images/logo.png
elif [ ! -f "$HESTIA/web/images/custom/logo.png" ] && [ "$download" = "yes" ]; then 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 fi
if [ -f "$HESTIA/web/images/custom/logo-header.svg" ]; then 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 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 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 fi
if [ -f "$HESTIA/web/images/custom/favicon.png" ]; then if [ -f "$HESTIA/web/images/custom/favicon.png" ]; then
cp -f $HESTIA/web/images/custom/favicon.png $HESTIA/web/images/favicon.png cp -f $HESTIA/web/images/custom/favicon.png $HESTIA/web/images/favicon.png
elif [ ! -f "$HESTIA/web/images/custom/favicon.png" ] && [ "$download" = "yes" ]; then 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 fi
if [ -f "$HESTIA/web/images/custom/favicon.ico" ]; then if [ -f "$HESTIA/web/images/custom/favicon.ico" ]; then
cp -f $HESTIA/web/images/custom/favicon.ico $HESTIA/web/favicon.ico cp -f $HESTIA/web/images/custom/favicon.ico $HESTIA/web/favicon.ico
elif [ ! -f "$HESTIA/web/images/custom/favicon.ico" ] && [ "$download" = "yes" ]; then 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 fi
#----------------------------------------------------------# #----------------------------------------------------------#

2
docs/.vitepress/theme/components/InstallOptions.vue
View File

@@ -13,7 +13,7 @@ export default {
return { return {
pageloader: false, pageloader: false,
hestia_wget: 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", hestia_install: "sudo bash hst-install.sh",
installStr: "", installStr: "",
}; };

2
docs/docs/introduction/getting-started.md
View File

@@ -43,7 +43,7 @@ Interactive installer that will install the default Hestia software configuratio
Download the installation script for the latest release: Download the installation script for the latest release:
```bash ```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: 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:

8
func/domain.sh
View File

@@ -108,8 +108,12 @@ prepare_web_backend() {
pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;) pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
fi fi
# Check if multiple-PHP installed # Check if multiple-PHP installed
regex="socket-(\d+)_(\d+)" if [ -f "/etc/redhat-release" ]; then
if [[ $backend_template =~ ^.*PHP-([0-9])\_([0-9])$ ]]; 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 if [ -f "/etc/redhat-release" ]; then
backend_version="${BASH_REMATCH[1]}${BASH_REMATCH[2]}" 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" \)) pool=$(find -L /etc/opt/remi/php$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))

2
func/main.sh
View File

@@ -28,7 +28,7 @@ MAILTPL=$HESTIA/data/templates/mail
DNSTPL=$HESTIA/data/templates/dns DNSTPL=$HESTIA/data/templates/dns
RRD=$HESTIA/web/rrd RRD=$HESTIA/web/rrd
SENDMAIL="$HESTIA/web/inc/mail-wrapper.php" 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="$HESTIA/web/css/themes"
HESTIA_THEMES_CUSTOM="$HESTIA/web/css/themes/custom" HESTIA_THEMES_CUSTOM="$HESTIA/web/css/themes/custom"
SCRIPT="$(basename $0)" SCRIPT="$(basename $0)"

10
install/hst-install-rhel.sh
View File

@@ -679,7 +679,7 @@ echo
# Installing Nginx repo # Installing Nginx repo
echo "[ * ] NGINX" 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 # Installing Remi PHP repo
echo "[ * ] PHP" echo "[ * ] PHP"
@@ -688,7 +688,7 @@ dnf install -y https://rpms.remirepo.net/enterprise/remi-release-$release.rpm
# Installing MariaDB repo # Installing MariaDB repo
if [ "$mysql" = 'yes' ]; then if [ "$mysql" = 'yes' ]; then
echo "[ * ] MariaDB" 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 fi
# Enabling MySQL module # Enabling MySQL module
@@ -701,9 +701,9 @@ fi
# Installing HestiaCP repo # Installing HestiaCP repo
echo "[ * ] Hestia Control Panel" echo "[ * ] Hestia Control Panel"
dnf config-manager --add-repo https://dev.putey.net/bayrepo/hestiacp/raw/branch/master/install/rpm/hestia/hestia.repo dnf config-manager --add-repo https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/rpm/hestia/hestia.repo
rpm --import https://repo.putey.net/repo/gpgkeys/repo.putey.net.pub rpm --import https://repo.brepo.ru/repo/gpgkeys/repo.brepo.ru.pub
check_result $? "rpm import putey.net GPG key failed" check_result $? "rpm import brepo.ru GPG key failed"
mkdir /var/cache/hestia-nginx/ mkdir /var/cache/hestia-nginx/
chown admin:admin /var/cache/hestia-nginx/ chown admin:admin /var/cache/hestia-nginx/

4
install/hst-install-ubuntu.sh
View File

@@ -434,7 +434,7 @@ fi
# Validate whether installation script matches release version before continuing with install # Validate whether installation script matches release version before continuing with install
if [ -z "$withdebs" ] || [ ! -d "$withdebs" ]; then 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 if [ "$HESTIA_INSTALL_VER" != "$release_branch_ver" ]; then
echo echo
echo -e "\e[91mInstallation aborted\e[0m" 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[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 -e "\e[33mPlease download the installer from the release branch in order to continue:\e[0m"
echo "" 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 ""
echo -e "\e[33mTo test pre-release versions, build the .deb packages and re-run the installer:\e[0m" 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" echo -e " \e[33m./hst_autocompile.sh \e[1m--hestia branchname no\e[21m\e[0m"

8
install/hst-install.sh
View File

@@ -90,7 +90,7 @@ check_wget_curl() {
# Check wget # Check wget
if [ -e '/usr/bin/wget' ]; then if [ -e '/usr/bin/wget' ]; then
if [ -e '/etc/redhat-release' ]; 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 if [ "$?" -eq '0' ]; then
bash hst-install-rhel.sh $* bash hst-install-rhel.sh $*
exit exit
@@ -99,7 +99,7 @@ check_wget_curl() {
exit 1 exit 1
fi fi
else 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 if [ "$?" -eq '0' ]; then
bash hst-install-$type.sh $* bash hst-install-$type.sh $*
exit exit
@@ -113,7 +113,7 @@ check_wget_curl() {
# Check curl # Check curl
if [ -e '/usr/bin/curl' ]; then if [ -e '/usr/bin/curl' ]; then
if [ -e '/etc/redhat-release' ]; 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 if [ "$?" -eq '0' ]; then
bash hst-install-rhel.sh $* bash hst-install-rhel.sh $*
exit exit
@@ -122,7 +122,7 @@ check_wget_curl() {
exit 1 exit 1
fi fi
else 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 if [ "$?" -eq '0' ]; then
bash hst-install-$type.sh $* bash hst-install-$type.sh $*
exit exit

8
install/rpm/hestia/hestia.repo
View File

@@ -1,7 +1,7 @@
[hestiacp] [hestiacp]
name=msvsphere9 repo on repo.putey.net name=msvsphere9 repo on repo.brepo.ru
comment=msvsphere9 repo on repo.putey.net comment=msvsphere9 repo on repo.brepo.ru
baseurl=https://repo.putey.net/repo/msvsphere9_preprod baseurl=https://repo.brepo.ru/repo/msvsphere9_preprod
enabled=1 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 gpgcheck=1

6
src/hst_bootstrap_install.sh
View File

@@ -11,11 +11,11 @@ os=$3
# Download specified installer and compiler # Download specified installer and compiler
if [ -f "/etc/redhat-release" ]; then 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 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 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 # Execute compiler and build hestia core package
chmod +x hst_autocompile.sh chmod +x hst_autocompile.sh

2
src/lxd_compile.sh
View File

@@ -8,7 +8,7 @@ else
apt -y install curl wget apt -y install curl wget
fi 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 chmod +x /tmp/hst_autocompile.sh
mkdir -p /opt/hestiacp mkdir -p /opt/hestiacp

2
test/make-test-containers.php
View File

@@ -259,7 +259,7 @@ function getHestiaVersion($branch) {
$control_file = file_get_contents(SHARED_HOST_FOLDER . "/hestiacp/src/rpm/hestia/control"); $control_file = file_get_contents(SHARED_HOST_FOLDER . "/hestiacp/src/rpm/hestia/control");
} else { } else {
$control_file = file_get_contents( $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",
); );
} }