Refactor (#10421)

ct/firefly.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-1024}"
 var_disk="${var_disk:-2}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -73,17 +73,13 @@ function update_script() {
     msg_ok "Updated Firefly"
 
     if [[ "${IMPORTER_INSTALLED:-0}" -eq 1 ]]; then
+      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "dataimporter" "firefly-iii/data-importer" "prebuild" "latest" "/opt/firefly/dataimporter" "DataImporter-v*.tar.gz"
+
       msg_info "Updating Firefly Importer"
-      IMPORTER_RELEASE=$(curl -fsSL https://api.github.com/repos/firefly-iii/data-importer/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//')
-      rm -rf /opt/firefly/dataimporter
-      mkdir -p /opt/firefly/dataimporter
-      curl -fsSL "https://github.com/firefly-iii/data-importer/releases/download/v${IMPORTER_RELEASE}/DataImporter-v${IMPORTER_RELEASE}.tar.gz" -o "/opt/DataImporter.tar.gz"
-      tar -xzf /opt/DataImporter.tar.gz -C /opt/firefly/dataimporter
       if [[ -f /opt/dataimporter.env ]]; then
         cp /opt/dataimporter.env /opt/firefly/dataimporter/.env
       fi
       chown -R www-data:www-data /opt/firefly/dataimporter
-      rm -f /opt/DataImporter.tar.gz
       msg_ok "Updated Firefly Importer"
     fi
     systemctl start apache2

frontend/public/json/firefly.json

@@ -23,7 +23,7 @@
         "ram": 1024,
         "hdd": 2,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],

install/firefly-install.sh

@@ -16,24 +16,10 @@ update_os
 PHP_VERSION="8.4" PHP_APACHE="YES" PHP_MODULE="mysql" setup_php
 setup_composer
 setup_mariadb
-LOCAL_IP=$(hostname -I | awk '{print $1}')
+MARIADB_DB_NAME="firefly" MARIADB_DB_USER="firefly" setup_mariadb_db
-
+import_local_ip
-msg_info "Setting up database"
-DB_NAME=firefly
-DB_USER=firefly
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-{
-  echo "Firefly-Credentials"
-  echo "Firefly Database User: $DB_USER"
-  echo "Firefly Database Password: $DB_PASS"
-  echo "Firefly Database Name: $DB_NAME"
-} >>~/firefly.creds
-msg_ok "Set up database"
-
 fetch_and_deploy_gh_release "firefly" "firefly-iii/firefly-iii" "prebuild" "latest" "/opt/firefly" "FireflyIII-*.zip"
+fetch_and_deploy_gh_release "dataimporter" "firefly-iii/data-importer" "prebuild" "latest" "/opt/firefly/dataimporter" "DataImporter-v*.tar.gz"
 
 msg_info "Configuring Firefly III (Patience)"
 chown -R www-data:www-data /opt/firefly
@@ -41,22 +27,19 @@ chmod -R 775 /opt/firefly/storage
 cd /opt/firefly
 cp .env.example .env
 sed -i "s/DB_HOST=.*/DB_HOST=localhost/" /opt/firefly/.env
-sed -i "s/DB_PASSWORD=.*/DB_PASSWORD=$DB_PASS/" /opt/firefly/.env
+sed -i "s/DB_PASSWORD=.*/DB_PASSWORD=$MARIADB_DB_PASS/" /opt/firefly/.env
 $STD composer install --no-dev --no-plugins --no-interaction
 $STD php artisan firefly:upgrade-database
 $STD php artisan firefly:correct-database
 $STD php artisan firefly:report-integrity
 $STD php artisan firefly:laravel-passport-keys
-IMPORTER_RELEASE=$(curl -fsSL https://api.github.com/repos/firefly-iii/data-importer/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
+msg_ok "Configured Firefly III"
-mkdir -p /opt/firefly/dataimporter
+
-cd /opt
+msg_info "Configuring Data Importer"
-curl -fsSL "https://github.com/firefly-iii/data-importer/releases/download/v${IMPORTER_RELEASE}/DataImporter-v${IMPORTER_RELEASE}.tar.gz" -o "DataImporter-v${IMPORTER_RELEASE}.tar.gz"
-tar -xzf "DataImporter-v${IMPORTER_RELEASE}.tar.gz" -C /opt/firefly/dataimporter
 cp /opt/firefly/dataimporter/.env.example /opt/firefly/dataimporter/.env
 sed -i "s#FIREFLY_III_URL=#FIREFLY_III_URL=http://${LOCAL_IP}#g" /opt/firefly/dataimporter/.env
 chown -R www-data:www-data /opt/firefly
-rm -rf "/opt/DataImporter-v${IMPORTER_RELEASE}.tar.gz"
+msg_ok "Configured Data Importer"
-msg_ok "Configured Firefly III"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/apache2/sites-available/firefly.conf
@@ -69,6 +52,8 @@ cat <<EOF >/etc/apache2/sites-available/firefly.conf
         AllowOverride All
         Require all granted
     </Directory>
+  
+  RedirectMatch 301 ^/dataimporter$ /dataimporter/
 
   Alias /dataimporter/ /opt/firefly/dataimporter/public/