Compare commits

..

No commits in common. "f6513f78e6b99d29c67c49f29037134c66074910" and "3d49f1c7c92cffd145e88da1e418479f80ceb17f" have entirely different histories.

1 changed files with 10 additions and 26 deletions

View File

@ -2,7 +2,7 @@
#SETTINGS #SETTINGS
passlen=22 passlen=22
emailforle="" emailforle="putyouremailaddresshere@domain.com"
#FUNCTIONS #FUNCTIONS
function errorcheck { function errorcheck {
@ -92,13 +92,6 @@ function gathersettings {
echo "IP address is $ipaddress..." echo "IP address is $ipaddress..."
echo -n "What is the FQDN for the server? " echo -n "What is the FQDN for the server? "
read fqdn read fqdn
echo -n "Do you want to configure the system hostname the same as the FQDN? (y/n)"
read reply
if [[ $reply == "y" ]]; then
sethost=true
else
sethost=false
fi
echo -n "Must an SLL certificate be used? (y/n)" echo -n "Must an SLL certificate be used? (y/n)"
read reply read reply
if [[ $reply == "y" ]]; then if [[ $reply == "y" ]]; then
@ -151,9 +144,6 @@ function gathersettings {
if [[ $mailfrom == "" ]]; then if [[ $mailfrom == "" ]]; then
mailfrom=$mailuser mailfrom=$mailuser
fi fi
if [[ $emailforle == "" ]]; then
emailforle=$mailfrom
fi
echo -n "What is the sender name for the mailserver? " echo -n "What is the sender name for the mailserver? "
read mailname read mailname
echo echo
@ -228,15 +218,13 @@ function applysettings {
function sethostname { function sethostname {
#SETTING UP HOSTNAME #SETTING UP HOSTNAME
if [[ $sethost == true ]]; then echo "Setting up hostname..."
echo "Setting up hostname..." hostnamectl set-hostname ${fqdn%%.*} > /dev/null 2>&1
hostnamectl set-hostname ${fqdn%%.*} > /dev/null 2>&1 errorcheck $? "define hostname" "EXIT"
errorcheck $? "define hostname" "EXIT" echo "$ipaddress $fqdn ${fqdn%%.*}" >> /etc/hosts
echo "$ipaddress $fqdn ${fqdn%%.*}" >> /etc/hosts errorcheck $? "define FQDN" "EXIT"
errorcheck $? "define FQDN" "EXIT" echo "1" > "$origpath/setupninja.step"
echo "1" > "$origpath/setupninja.step" echo
echo
fi
} }
function initsetup { function initsetup {
@ -291,8 +279,8 @@ function gomariadb {
function gophp { function gophp {
#INSTALL PHP #INSTALL PHP
echo "Install PHP8.2..." echo "Install PHP8.2..."
apt -y install php8.2-{fpm,soap,bcmath,common,imagick,mysql,gmp,curl,intl,mbstring,xmlrpc,gd,xml,cli,zip,bz2,fpm} libapache2-mod-php8.2 libapache2-mod-fcgid > /dev/null 2>&1 apt -y install php8.2-{fpm,soap,bcmath,common,imagick,mysql,gmp,curl,intl,mbstring,xmlrpc,gd,xml,cli,zip,bz2,fpm} libapache2-mod-php libapache2-mod-fcgid > /dev/null 2>&1
errorcheck $? "apt -y install php8.2-{fpm,soap,bcmath,common,imagick,mysql,gmp,curl,intl,mbstring,xmlrpc,gd,xml,cli,zip,bz2,fpm} libapache2-mod-php8.2 libapache2-mod-fcgid" "EXIT" errorcheck $? "apt -y install php8.2-{fpm,soap,bcmath,common,imagick,mysql,gmp,curl,intl,mbstring,xmlrpc,gd,xml,cli,zip,bz2,fpm} libapache2-mod-php libapache2-mod-fcgid" "EXIT"
echo "7" > "$origpath/setupninja.step" echo "7" > "$origpath/setupninja.step"
echo echo
} }
@ -452,10 +440,6 @@ function vhostninja {
echo " Require all granted" >> /etc/apache2/sites-available/$appdbname.conf echo " Require all granted" >> /etc/apache2/sites-available/$appdbname.conf
echo " </Directory>" >> /etc/apache2/sites-available/$appdbname.conf echo " </Directory>" >> /etc/apache2/sites-available/$appdbname.conf
echo "" >> /etc/apache2/sites-available/$appdbname.conf echo "" >> /etc/apache2/sites-available/$appdbname.conf
echo " <FilesMatch \.php$>" >> /etc/apache2/sites-available/$appdbname.conf
echo " SetHandler \"proxy:unix:/run/php/php8.2-fpm.sock|fcgi://localhost\"" >> /etc/apache2/sites-available/$appdbname.conf
echo " </FilesMatch>" >> /etc/apache2/sites-available/$appdbname.conf
echo "" >> /etc/apache2/sites-available/$appdbname.conf
echo " ErrorLog ${APACHE_LOG_DIR}/$appdbname_error.log" >> /etc/apache2/sites-available/$appdbname.conf echo " ErrorLog ${APACHE_LOG_DIR}/$appdbname_error.log" >> /etc/apache2/sites-available/$appdbname.conf
echo " CustomLog ${APACHE_LOG_DIR}/$appdbname_access.log combined" >> /etc/apache2/sites-available/$appdbname.conf echo " CustomLog ${APACHE_LOG_DIR}/$appdbname_access.log combined" >> /etc/apache2/sites-available/$appdbname.conf
echo "</VirtualHost>" >> /etc/apache2/sites-available/$appdbname.conf echo "</VirtualHost>" >> /etc/apache2/sites-available/$appdbname.conf