diff options
| -rw-r--r-- | .debianinstall/README.md | 7 | ||||
| -rw-r--r-- | .debianinstall/config.txt.template | 5 | ||||
| -rw-r--r-- | .debianinstall/debian-setup.sh | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/.debianinstall/README.md b/.debianinstall/README.md index 46e0e0858..e157c0876 100644 --- a/.debianinstall/README.md +++ b/.debianinstall/README.md @@ -27,9 +27,7 @@ if you look for more choices. The main differences are: - graphical installer whiptail - The script stops (fails) if it finds results of a previous installation. (The [debian-setup.sh](https://framagit.org/ojrandom/core/-/tree/dev/.debianinstall) will just jump over it.) - If something fails the script tries to clean up everything that was installed up to the point of failure. (That might cause trouble if certbot registered a certificate already.) -- The script under [homeinstall](https://framagit.org/hubzilla/core/-/tree/master/.homeinstall) seems to be an older version of the scripts used for Streams - + [autoinstall](https://codeberg.org/streams/streams/src/branch/dev/contrib/autoinstall) - + [easyinstall](https://codeberg.org/streams/streams/src/branch/dev/contrib/easyinstall) +- The script under [homeinstall](https://framagit.org/hubzilla/core/-/tree/master/.homeinstall) seems to be an older version of the scripts used for Streams, i.e. [autoinstall](https://codeberg.org/streams/streams/src/branch/dev/contrib/autoinstall) and [easyinstall](https://codeberg.org/streams/streams/src/branch/dev/contrib/easyinstall) ## Preconditions @@ -153,6 +151,3 @@ to boot the Rapsi to the client console. DO NOT FORGET TO CHANGE THE DEFAULT PASSWORD FOR USER PI! -## Reminder for Different Web Wervers - -For those of you who feel adventurous enough to use a different web server (i.e. Lighttpd...), don't forget that this script will install Apache or Nginx and that you can only have one web server listening to ports 80 & 443. Also, don't forget to tweak your daily shell script in /var/www/ accordingly. diff --git a/.debianinstall/config.txt.template b/.debianinstall/config.txt.template index 1737b52ad..065515653 100644 --- a/.debianinstall/config.txt.template +++ b/.debianinstall/config.txt.template @@ -93,9 +93,8 @@ freedns_key= # If left empty, both your database and user will be named after your zot instance (hubzilla, zap or misty) # Use custom name, at least fo the database, if you plan to run more than one hub/instance on the same server # -zotserver_db_name= -zotserver_db_user= -zotserver_db_pass=$db_pass +db_name=hubzilla +db_user=hubzilla # # # Password for package mysql-server diff --git a/.debianinstall/debian-setup.sh b/.debianinstall/debian-setup.sh index 9e9b3fc1a..cef34c3b2 100644 --- a/.debianinstall/debian-setup.sh +++ b/.debianinstall/debian-setup.sh @@ -150,7 +150,7 @@ function install_sendmail { function install_php { # openssl and mbstring are included in libapache2-mod-php print_info "installing php..." - nocheck_install "libapache2-mod-php php php-pear php-curl php-gd php-mbstring php-xml php-zip" + nocheck_install "libapache2-mod-php php php-pear php-curl php-gd php-mbstring php-xml php-zip php-intl php-bcmath" phpversion=$(php -v|grep --only-matching --perl-regexp "(PHP )\d+\.\\d+\.\\d+"|cut -c 5-7) sed -i "s/^upload_max_filesize =.*/upload_max_filesize = 100M/g" /etc/php/$phpversion/apache2/php.ini sed -i "s/^post_max_size =.*/post_max_size = 100M/g" /etc/php/$phpversion/apache2/php.ini @@ -256,12 +256,18 @@ function create_zotserver_db { then Q1="CREATE DATABASE IF NOT EXISTS $db_name;" Q2="GRANT USAGE ON *.* TO $db_user@localhost IDENTIFIED BY '$db_pass';" - Q3="GRANT ALL PRIVILEGES ON $name.* to $db_user@localhost identified by '$db_pass';" + Q3="GRANT ALL PRIVILEGES ON $db_name.* to $db_user@localhost identified by '$db_pass';" Q4="FLUSH PRIVILEGES;" SQL="${Q1}${Q2}${Q3}${Q4}" mysql -uroot -p$mysqlpass -e "$SQL" else echo "database $db_name does exist already" + Q1="CREATE DATABASE IF NOT EXISTS $db_name;" + Q2="GRANT USAGE ON *.* TO $db_user@localhost IDENTIFIED BY '$db_pass';" + Q3="GRANT ALL PRIVILEGES ON $db_name.* to $db_user@localhost identified by '$db_pass';" + Q4="FLUSH PRIVILEGES;" + SQL="${Q1}${Q2}${Q3}${Q4}" + mysql -uroot -p$mysqlpass -e "$SQL" fi } |