Votre Nom 1 year ago
parent
commit
b24f94f07e
4 changed files with 75 additions and 41 deletions
  1. 1 0
      build_cube.sh
  2. 57 21
      options/chia.sh
  3. 16 20
      options/download_pack.sh
  4. 1 0
      pack/clean.sh

+ 1 - 0
build_cube.sh

@@ -5,6 +5,7 @@ Cuda=YES
 kernel_custom=YES
 kernel_custom=YES
 Webmin="webmin-2.102"
 Webmin="webmin-2.102"
 kernel_dkms="5.15.0-71-generic"
 kernel_dkms="5.15.0-71-generic"
+driver=NVIDIA
 if (( $EUID != 0 )); then
 if (( $EUID != 0 )); then
    echo -e "$(tput setaf 11)This must be run as root. Try 'sudo $0'.$(tput sgr0)"
    echo -e "$(tput setaf 11)This must be run as root. Try 'sudo $0'.$(tput sgr0)"
    exit 1
    exit 1

+ 57 - 21
options/chia.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 #!/bin/bash
 set -e
 set -e
 Gui=No #can be Yes No or Only
 Gui=No #can be Yes No or Only
-Version=4.6
+Version=5.0.0
 MadMax=Yes
 MadMax=Yes
 GigaHorse=Yes
 GigaHorse=Yes
 BladeBit=Yes
 BladeBit=Yes
 ChiaPos=Yes
 ChiaPos=Yes
-Service=No
+ChiaService=Yes
 Miner=Yes
 Miner=Yes
+ChiaProxy=Yes
 function print_centered {
 function print_centered {
      [[ $# == 0 ]] && return 1
      [[ $# == 0 ]] && return 1
 
 
@@ -42,18 +43,20 @@ function jumpto
 function simplify_config {
 function simplify_config {
 error_flag=0
 error_flag=0
 Gui=${Gui^^}
 Gui=${Gui^^}
-Service=${Service^^}
+ChiaService=${ChiaService^^}
 MadMax=${MadMax^^}
 MadMax=${MadMax^^}
 GigaHorse=${GigaHorse^^}
 GigaHorse=${GigaHorse^^}
 BladeBit=${BladeBit^^}
 BladeBit=${BladeBit^^}
 ChiaPos=${ChiaPos^^}
 ChiaPos=${ChiaPos^^}
 Miner=${Miner^^}
 Miner=${Miner^^}
+ChiaProxy=${ChiaProxy^^}
 if [ $MadMax = "YES" ] || [ $MadMax = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $MadMax = "YES" ] || [ $MadMax = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $GigaHorse = "YES" ] || [ $GigaHorse = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $GigaHorse = "YES" ] || [ $GigaHorse = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $BladeBit = "YES" ] || [ $BladeBit = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $BladeBit = "YES" ] || [ $BladeBit = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $ChiaPos = "YES" ] || [ $ChiaPos = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $ChiaPos = "YES" ] || [ $ChiaPos = "NO" ];then error_flag=0;else error_flag=1;fi
-if [ $Service = "YES" ] || [ $Service = "NO" ];then error_flag=0;else error_flag=1;fi
+if [ $ChiaService = "YES" ] || [ $ChiaService = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $Miner = "YES" ] || [ $Miner = "NO" ];then error_flag=0;else error_flag=1;fi
 if [ $Miner = "YES" ] || [ $Miner = "NO" ];then error_flag=0;else error_flag=1;fi
+if [ $ChiaProxy = "YES" ] || [ $ChiaProxy = "NO" ];then error_flag=0;else error_flag=1;fi
 }
 }
 
 
 function intro_ {
 function intro_ {
@@ -98,13 +101,20 @@ ONLY)
 esac
 esac
 if [ $Gui = "NO" ] || [ $Gui = "YES" ]
 if [ $Gui = "NO" ] || [ $Gui = "YES" ]
 then
 then
-case $Service in
+case $ChiaService in
 YES)
 YES)
 	echo -n "$(tput setaf 11)"
 	echo -n "$(tput setaf 11)"
 	print_centered "Mining service Enabled"
 	print_centered "Mining service Enabled"
 	echo -n "$(tput sgr0)"
 	echo -n "$(tput sgr0)"
 	;;
 	;;
 esac
 esac
+case $ChiaProxy in
+YES)
+	echo -n "$(tput setaf 11)"
+        print_centered "Hpool x-Proxy Enabled"
+	echo -n "$(tput sgr0)"
+        ;;
+esac
 fi
 fi
 sleep 3
 sleep 3
 if ! [ -d /home/wareck/chia ];then mkdir /home/wareck/chia;fi
 if ! [ -d /home/wareck/chia ];then mkdir /home/wareck/chia;fi
@@ -112,13 +122,7 @@ if ! [ -d /home/wareck/chia ];then mkdir /home/wareck/chia;fi
 
 
 function update_ {
 function update_ {
 echo -e "$(tput setaf 10)\nUpdate and install packages:$(tput sgr0)"
 echo -e "$(tput setaf 10)\nUpdate and install packages:$(tput sgr0)"
-sleep 1
-#if grep "Drivers=NVIDIA" /home/wareck/Build_Cube/build_cube.sh >/dev/null
-#then
 extend="libgomp1 ocl-icd-opencl-dev libgmp-dev libnuma-dev"
 extend="libgomp1 ocl-icd-opencl-dev libgmp-dev libnuma-dev"
-#else
-#extend=""
-#fi
 sudo apt-get install python3-venv python3-distutils python3-dev libsodium-dev $extend -y
 sudo apt-get install python3-venv python3-distutils python3-dev libsodium-dev $extend -y
 echo -e "\e[97mDone.\e[0m"
 echo -e "\e[97mDone.\e[0m"
 }
 }
@@ -286,6 +290,40 @@ sh install-gui.sh
 echo -e "\e[97mDone.\e[0m"
 echo -e "\e[97mDone.\e[0m"
 }
 }
 
 
+function chia_proxy {
+echo -e "$(tput setaf 10)\nChia-X-Proxy (Cuda):$(tput sgr0)"
+wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/chia-x-proxy.tar.xz -O /home/wareck/Build_Cube/pack/chia-x-proxy.tar.xz
+cp /home/wareck/Build_Cube/pack/chia-x-proxy.tar.xz /home/wareck/
+cd /home/wareck/chia/
+tar xvfJ /home/wareck/chia-x-proxy.tar.xz
+rm /home/wareck/chia-x-proxy.tar.xz
+sleep 1
+cat <<'EOF'>> x-proxy.service
+[Unit]
+Description=x-proxy h9
+After=network.target
+StartLimitIntervalSec=500
+StartLimitBurst=5
+[Service]
+#Restart=on-failure
+#RestartSec=5s
+WorkingDirectory=/home/wareck/chia/x-proxy/
+User=wareck
+Group=adm
+ExecStart=/usr/bin/screen -DmS x-proxy /home/wareck/chia/x-proxy/x-proxy-v1.9.1 -config /home/wareck/chia/x-proxy/config.yaml
+ExecStop=/usr/bin/screen -S x-proxy -X quit
+
+LimitNOFILE=999999
+[Install]
+WantedBy=multi-user.target
+EOF
+sudo mv x-proxy.service /etc/systemd/system/x-proxy.service
+sudo systemctl daemon-reload
+sudo systemctl start x-proxy.service
+sudo systemctl enable x-proxy.service
+echo -e "\e[97mDone.\e[0m"
+}
+
 function service_old {
 function service_old {
 echo -e "$(tput setaf 10)\nInstall chia-miner service (hpool) :$(tput sgr0)"
 echo -e "$(tput setaf 10)\nInstall chia-miner service (hpool) :$(tput sgr0)"
 sleep 1
 sleep 1
@@ -375,16 +413,14 @@ simplify_config
 intro_
 intro_
 update_
 update_
 cmake_
 cmake_
-case $Gui in
-NO|YES)
-        if [ $GigaHorse = "YES" ];then gigahorse;fi
-	if [ $MadMax = "YES" ];then chia_plotter;fi
-	if [ $BladeBit = "YES" ];then bladebit;fi
-	if [ $ChiaPos = "YES" ];then chiapos;fi
-	if [ $Service = "YES" ];then service_;fi
-	if [ $Miner = "YES" ];then miner_;fi
-	;;
-esac
+if [ $GigaHorse = "YES" ];then gigahorse;fi
+if [ $MadMax = "YES" ];then chia_plotter;fi
+if [ $BladeBit = "YES" ];then bladebit;fi
+if [ $ChiaPos = "YES" ];then chiapos;fi
+if [ $ChiaService = "YES" ];then service_;fi
+if [ $Miner = "YES" ];then miner_;fi
+if [ $ChiaProxy = "YES" ]; then chia_proxy;fi
+
 case $Gui in
 case $Gui in
 YES|ONLY)
 YES|ONLY)
         chia_blockchain
         chia_blockchain

+ 16 - 20
options/download_pack.sh

@@ -1,24 +1,21 @@
 #!/bin/bash
 #!/bin/bash
+Webmin=${Webmin^^}
+MadMax=${MadMax^^}
+GigaHorse=${GigaHorse^^}
+BladeBit=${BladeBit^^}
+ChiaPos=${ChiaPos^^}
+Miner=${Miner^^}
+
 Webmin=$(grep "Webmin=" /home/wareck/Build_Cube/build_cube.sh  | cut -d '"' -f 2)
 Webmin=$(grep "Webmin=" /home/wareck/Build_Cube/build_cube.sh  | cut -d '"' -f 2)
+driver=$(grep "driver=" /home/wareck/Build_Cube/build_cube.sh  | sed 's/driver=//g')
+Cuda=$(grep "Cuda=" /home/wareck/Build_Cube/build_cube.sh  | sed 's/Cuda=//g')
+driver=${driver^^}
+Cuda=${Cuda^^}
+
 if [ ! -d temp ]; then
 if [ ! -d temp ]; then
 mkdir temp
 mkdir temp
 fi
 fi
 cd temp
 cd temp
-if grep "driver=AMD" /home/wareck/Build_Cube/build_cube.sh >/dev/null
-then
-driver="AMD"
-else
-driver="NVIDIA"
-fi
-
-if grep "Cuda=Yes" /home/wareck/Build_Cube/build_cube.sh >/dev/null
-then
-Cuda="YES"
-else
-Cuda="No"
-fi
-
-
 
 
 function download_copy {
 function download_copy {
 FILE=/home/wareck/Build_Cube/pack/$box
 FILE=/home/wareck/Build_Cube/pack/$box
@@ -54,17 +51,16 @@ download_copy
 
 
 if [ $driver = "AMD" ]
 if [ $driver = "AMD" ]
 then
 then
-#box=amdgpu-install_22.10.2.50102-1_all.deb
-#download_copy
-#box=amdgpu-install_22.20.50200-1_all.deb
-#download_copy
 box=amdgpu-install_5.4.50403-1_all.deb
 box=amdgpu-install_5.4.50403-1_all.deb
 download_copy
 download_copy
 fi
 fi
 
 
 if [ $Cuda = "YES" ]
 if [ $Cuda = "YES" ]
 then
 then
-box=cuda_11.8.0_520.61.05_linux.run
+#box=cuda_11.8.0_520.61.05_linux.run
+#box=cuda_12.2.2_535.104.05_linux.run
+#download_copy
+box=chia-x-proxy.tar.xz
 download_copy
 download_copy
 fi
 fi
 
 

+ 1 - 0
pack/clean.sh

@@ -15,6 +15,7 @@ if [ -f linux-firmware.tar.xz ]; then sudo rm linux-firmware.tar.xz;fi
 if [ -f gpu-miners.tar.xz ]; then sudo rm gpu-miners.tar.xz;fi
 if [ -f gpu-miners.tar.xz ]; then sudo rm gpu-miners.tar.xz;fi
 if [ -f flexfarmer.tar.xz ]; then sudo rm flexfarmer.tar.xz;fi
 if [ -f flexfarmer.tar.xz ]; then sudo rm flexfarmer.tar.xz;fi
 if [ -f cuda_11.8.0_520.61.05_linux.run ];then sudo rm cuda_11.8.0_520.61.05_linux.run;fi
 if [ -f cuda_11.8.0_520.61.05_linux.run ];then sudo rm cuda_11.8.0_520.61.05_linux.run;fi
+if [ -f chia-x-proxy.tar.xz ]; then sudo rm chia-x-proxy.tar.xz;fi
 
 
 Webmin=$(grep "Webmin=" ../build_cube.sh  | cut -d '"' -f 2)
 Webmin=$(grep "Webmin=" ../build_cube.sh  | cut -d '"' -f 2)
 if [ -f $Webmin.tar.xz ];then sudo rm $Webmin.tar.xz;fi
 if [ -f $Webmin.tar.xz ];then sudo rm $Webmin.tar.xz;fi