Skip to content

Commit

Permalink
Merge pull request #476 from andreapollastri/4.x
Browse files Browse the repository at this point in the history
Fix to main installation
  • Loading branch information
andreapollastri authored Mar 16, 2024
2 parents a76592f + 0568bbb commit dae05fe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# CIPI 4 is coming...

DO NOT USE Master branch... I'm working on it! Use 3.x branch!
Currently DO NOT USE Master branch... I'm working on it! Use 3.x branch!

Documentation is available on www.cipi.sh website!
16 changes: 3 additions & 13 deletions go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ echo "${reset}"
sleep 1s

sudo DEBIAN_FRONTEND=noninteractive apt-get -y update
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common curl wget nano vim rpl sed zip unzip expect dirmngr apt-transport-https lsb-release ca-certificates dnsutils dos2unix htop
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common curl wget nano vim rpl sed zip unzip expect dirmngr apt-transport-https lsb-release ca-certificates dnsutils dos2unix htop nodejs



Expand Down Expand Up @@ -281,6 +281,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.3-fileinfo
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.3-imap
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.3-cli
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.3-openssl
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install php8.3-intl
PHPINI=/etc/php/8.3/fpm/conf.d/cipi.ini
sudo touch $PHPINI
sudo cat > "$PHPINI" <<EOF
Expand Down Expand Up @@ -499,17 +500,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3-certbot-nginx



# NODE
clear
echo "${bggreen}${black}${bold}"
echo "Node/npm setup..."
echo "${reset}"
sleep 1s

curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - &&\
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs



#PANEL INSTALLATION
clear
Expand Down Expand Up @@ -647,7 +637,7 @@ echo " MySQL root user: cipi"
echo " MySQL root pass: $DATABASEPASSWORD"
echo ""
echo " To manage your server visit: "
echo " https://cipi-$SERVERIPWITHDASH$IPDOMAIN/login"
echo " https://cipi-$SERVERIPWITHDASH$IPDOMAIN/panel"
echo " Default credentials are: [email protected] / C1p1P4n3!#4.sh"
echo ""
echo " If panel is not available via HTTPS, try to run:"
Expand Down
2 changes: 1 addition & 1 deletion storage/app/scripts/getRamStatus.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

echo `free -m | awk '/Mem:/ { printf("%3.1f%", $3/$2*100) }'`
echo `free -m | awk '/Mem:/ { printf("%3.1f", $3/$2*100) }'`

0 comments on commit dae05fe

Please sign in to comment.