Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Fixed oopsie's

Browse Source
This commit is contained in:
Bram Prieshof
2020-07-30 15:22:26 +02:00
parent 8d10e8b853
commit 3b8c214dec
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AppendCMS.sh
View File

@@ -81,7 +81,6 @@ if [ $IMODE = n ]; then
[[ -d "/var/www/"$domain"/html" ]] && msg " This domain already exists on this server, Exiting" 8 78 && exit; [[ -d "/var/www/"$domain"/html" ]] && msg " This domain already exists on this server, Exiting" 8 78 && exit;
if (whiptail --title "Config" --yesno " Does www.${domain} exist in DNS" 8 78); then domainwww=1; else domainwww=0; fi if (whiptail --title "Config" --yesno " Does www.${domain} exist in DNS" 8 78); then domainwww=1; else domainwww=0; fi
if (whiptail --title "Set sitename?" --yesno "Set sitename to ${domain//./_} ?" 8 78); then if (whiptail --title "Set sitename?" --yesno "Set sitename to ${domain//./_} ?" 8 78); then
echo "Yes"
sitename=${domain//./_} sitename=${domain//./_}
else else
while true; do while true; do
@@ -117,8 +116,8 @@ if [ $IMODE = l ]; then
done done
read -p "Set sitename to ${domain//./_}? (y/n)" choice read -p "Set sitename to ${domain//./_}? (y/n)" choice
case "$choice" in case "$choice" in
y|Y ) echo "yes";sitename=${domain//./_};; y|Y ) sitename=${domain//./_};;
n|N ) echo "no"; n|N ) echo "";
while true; do while true; do
echo "Please enter sitename, Must NOT contain special characters, except: _";read sitename echo "Please enter sitename, Must NOT contain special characters, except: _";read sitename
if [[ $sitename == *['!'@#\$%^\&*()+,.]* ]] || [ -z "$sitename" ] if [[ $sitename == *['!'@#\$%^\&*()+,.]* ]] || [ -z "$sitename" ]
@@ -234,5 +233,5 @@ fi
# Done # # Done #
##-------## ##-------##
msg " Added CMS!"
bash /etc/update-motd.d/51* bash /etc/update-motd.d/51*
msg " Added CMS!"

2
AppendModule.sh
View File

@@ -258,5 +258,5 @@ done
# Done # # Done #
##-------## ##-------##
msg " Added Module!"
bash /etc/update-motd.d/51* bash /etc/update-motd.d/51*
msg " Added Module!"

2
CMS/nextcloud/MotdNextCloud
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
red='\e[1;31m%s\e[0m\n' red='\e[1;31m%s\e[0m\n'
printf "\n" printf "\n"
printf $red "Please run nextcloud-init.sh after the first nextcloud login" printf $red "Please run bash ~/nextcloud-init.sh after the first nextcloud login"
printf "\n" printf "\n"

5
CMS/nextcloud/conf.sh
View File

@@ -4,4 +4,9 @@ sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' -e 's/DOMAINname/'$
groupadd "$sitename" groupadd "$sitename"
useradd -g "$sitename" "$sitename" useradd -g "$sitename" "$sitename"
#Nextcloud logging location
mkdir /var/log/nextcloud
chmod 774 -R /var/log/nextcloud
ln -s /var/www/"$domain"/html/data/nextcloud.log /var/log/nextcloud/"$sitename"
systemctl reload php"$phpver"-fpm systemctl reload php"$phpver"-fpm

4
CMS/nextcloud/nginx-conf.sh
View File

@@ -7,8 +7,9 @@ sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/ng
if [ $sslenable = 0 ]; then if [ $sslenable = 0 ]; then
sed -i -e '/fastcgi_param HTTPS/c\# fastcgi_param HTTPS' /etc/nginx/sites-available/"$sitename" sed -i -e '/fastcgi_param HTTPS/c\# fastcgi_param HTTPS' /etc/nginx/sites-available/"$sitename"
fi fi
mkdir -p /var/www/"$domain"/html mkdir -p /var/www/"$domain"/html
systemctl reload nginx
#Getting Nextcloud #Getting Nextcloud
wget -t7 http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -O /tmp/nextcloud.tar.bz2 wget -t7 http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -O /tmp/nextcloud.tar.bz2
@@ -47,3 +48,4 @@ wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/nextcloud-init.sh -O ~/ne
sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/nextcloud-init.sh sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/nextcloud-init.sh
wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/51-nextnotice wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/51-nextnotice
chmod +x /etc/update-motd.d/51-nextnotice chmod +x /etc/update-motd.d/51-nextnotice

6
installer.sh
View File

@@ -239,8 +239,8 @@ while true; do
done done
read -p "Set sitename to ${domain//./_}? (y/n)" choice read -p "Set sitename to ${domain//./_}? (y/n)" choice
case "$choice" in case "$choice" in
y|Y ) echo "yes";sitename=${domain//./_};; y|Y ) sitename=${domain//./_};;
n|N ) echo "no"; n|N ) echo "";
while true; do while true; do
echo "Please enter sitename, Must NOT contain special characters, except: _";read sitename echo "Please enter sitename, Must NOT contain special characters, except: _";read sitename
if [[ $sitename == *['!'@#\$%^\&*()+,.]* ]] || [ -z "$sitename" ] if [[ $sitename == *['!'@#\$%^\&*()+,.]* ]] || [ -z "$sitename" ]
@@ -578,5 +578,5 @@ systemctl reload sshd postfix postfix@-
# Done # # Done #
##-------## ##-------##
msg " Done installing!"
bash /etc/update-motd.d/51* bash /etc/update-motd.d/51*
msg " Done installing!"