diff --git a/ct/inventree.sh b/ct/inventree.sh index f66e18a407..0d7c92a18b 100644 --- a/ct/inventree.sh +++ b/ct/inventree.sh @@ -42,4 +42,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" diff --git a/ct/mysql.sh b/ct/mysql.sh index 66224e0e2d..e113d595f7 100644 --- a/ct/mysql.sh +++ b/ct/mysql.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-13}" +var_version="${var_version:-12}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -20,18 +20,18 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -f /usr/share/keyrings/mysql.gpg ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_info "Updating ${APP} LXC" - $STD apt update - $STD apt -y upgrade - msg_ok "Updated Successfully" + header_info + check_container_storage + check_container_resources + if [[ ! -f /usr/share/keyrings/mysql.gpg ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + msg_info "Updating ${APP} LXC" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated Successfully" + exit } start @@ -41,4 +41,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following IP:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}${IP}:3306${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}${IP}:3306${CL}" diff --git a/ct/omv.sh b/ct/omv.sh index 29f1cd87ff..ec824d41cf 100644 --- a/ct/omv.sh +++ b/ct/omv.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}" var_ram="${var_ram:-1024}" var_disk="${var_disk:-4}" var_os="${var_os:-debian}" -var_version="${var_version:-13}" +var_version="${var_version:-12}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" @@ -20,18 +20,18 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -f /etc/apt/sources.list.d/openmediavault.list ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_info "Updating ${APP} LXC" - $STD apt update - $STD apt -y upgrade - msg_ok "Updated Successfully" + header_info + check_container_storage + check_container_resources + if [[ ! -f /etc/apt/sources.list.d/openmediavault.list ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + msg_info "Updating ${APP} LXC" + $STD apt update + $STD apt -y upgrade + msg_ok "Updated Successfully" + exit } start @@ -41,4 +41,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" diff --git a/ct/technitiumdns.sh b/ct/technitiumdns.sh index 1a0eeb89b2..9ed6246653 100644 --- a/ct/technitiumdns.sh +++ b/ct/technitiumdns.sh @@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-debian}" -var_version="${var_version:-13}" +var_version="${var_version:-12}" var_unprivileged="${var_unprivileged:-1}" header_info "$APP" diff --git a/frontend/public/json/mysql.json b/frontend/public/json/mysql.json index 2bd6b8aff6..3095480d79 100644 --- a/frontend/public/json/mysql.json +++ b/frontend/public/json/mysql.json @@ -1,48 +1,48 @@ { - "name": "MySQL", - "slug": "mysql", - "categories": [ - 8 - ], - "date_created": "2024-10-10", - "type": "ct", - "updateable": true, - "privileged": false, - "interface_port": null, - "documentation": "https://dev.mysql.com/doc/", - "website": "https://www.mysql.com/", - "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/mysql.webp", - "config_path": "", - "description": "MySQL is an open-source relational database management system (RDBMS) that uses SQL for managing and manipulating data. It is known for its scalability, reliability, and high performance, making it suitable for small to large-scale applications. Key features include support for ACID transactions, data replication for high availability, and compatibility with various programming languages like Python, PHP, and Java.", - "install_methods": [ - { - "type": "default", - "script": "ct/mysql.sh", - "resources": { - "cpu": 1, - "ram": 1024, - "hdd": 4, - "os": "debian", - "version": "13" - } - } - ], - "default_credentials": { - "username": null, - "password": null + "name": "MySQL", + "slug": "mysql", + "categories": [ + 8 + ], + "date_created": "2024-10-10", + "type": "ct", + "updateable": true, + "privileged": false, + "interface_port": null, + "documentation": "https://dev.mysql.com/doc/", + "website": "https://www.mysql.com/", + "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/mysql.webp", + "config_path": "", + "description": "MySQL is an open-source relational database management system (RDBMS) that uses SQL for managing and manipulating data. It is known for its scalability, reliability, and high performance, making it suitable for small to large-scale applications. Key features include support for ACID transactions, data replication for high availability, and compatibility with various programming languages like Python, PHP, and Java.", + "install_methods": [ + { + "type": "default", + "script": "ct/mysql.sh", + "resources": { + "cpu": 1, + "ram": 1024, + "hdd": 4, + "os": "debian", + "version": "12" + } + } + ], + "default_credentials": { + "username": null, + "password": null + }, + "notes": [ + { + "text": "Database credentials: `cat mysql.creds`", + "type": "info" }, - "notes": [ - { - "text": "Database credentials: `cat mysql.creds`", - "type": "info" - }, - { - "text": "With an option to install the MySQL 8.4 LTS release instead of MySQL 8.0", - "type": "info" - }, - { - "text": "If installed, access phpMyAdmin at `http:///phpMyAdmin`, case sensitive.", - "type": "info" - } - ] + { + "text": "With an option to install the MySQL 8.4 LTS release instead of MySQL 8.0", + "type": "info" + }, + { + "text": "If installed, access phpMyAdmin at `http:///phpMyAdmin`, case sensitive.", + "type": "info" + } + ] } diff --git a/frontend/public/json/omv.json b/frontend/public/json/omv.json index 41e7804284..6dd01ef4fd 100644 --- a/frontend/public/json/omv.json +++ b/frontend/public/json/omv.json @@ -23,7 +23,7 @@ "ram": 1024, "hdd": 4, "os": "debian", - "version": "13" + "version": "12" } } ], diff --git a/frontend/public/json/technitiumdns.json b/frontend/public/json/technitiumdns.json index 479a848014..57376feef4 100644 --- a/frontend/public/json/technitiumdns.json +++ b/frontend/public/json/technitiumdns.json @@ -23,7 +23,7 @@ "ram": 512, "hdd": 2, "os": "debian", - "version": "13" + "version": "12" } } ], diff --git a/install/mysql-install.sh b/install/mysql-install.sh index 44dcbcd76f..404f2957d4 100644 --- a/install/mysql-install.sh +++ b/install/mysql-install.sh @@ -63,27 +63,7 @@ msg_ok "MySQL Server configured" read -r -p "${TAB3}Would you like to add PhpMyAdmin? " prompt if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then - msg_info "Installing phpMyAdmin" - $STD apt install -y \ - apache2 \ - php \ - php-mysqli \ - php-mbstring \ - php-zip \ - php-gd \ - php-json \ - php-curl - - curl -fsSL "https://files.phpmyadmin.net/phpMyAdmin/5.2.2/phpMyAdmin-5.2.2-all-languages.tar.gz" -o "phpMyAdmin-5.2.2-all-languages.tar.gz" - mkdir -p /var/www/html/phpMyAdmin - tar xf phpMyAdmin-5.2.2-all-languages.tar.gz --strip-components=1 -C /var/www/html/phpMyAdmin - cp /var/www/html/phpMyAdmin/config.sample.inc.php /var/www/html/phpMyAdmin/config.inc.php - SECRET=$(openssl rand -base64 24) - sed -i "s#\$cfg\['blowfish_secret'\] = '';#\$cfg['blowfish_secret'] = '${SECRET}';#" /var/www/html/phpMyAdmin/config.inc.php - chmod 660 /var/www/html/phpMyAdmin/config.inc.php - chown -R www-data:www-data /var/www/html/phpMyAdmin - systemctl restart apache2 - msg_ok "Installed phpMyAdmin" + bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/phpmyadmin.sh)" fi msg_info "Start Service"