From bfde98d77f8a2098690b4f912c2583983069f2be Mon Sep 17 00:00:00 2001 From: Stefan Pejcic Date: Wed, 21 Aug 2024 11:19:52 +0200 Subject: [PATCH] Update INSTALL.sh --- version/0.2.5/INSTALL.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/version/0.2.5/INSTALL.sh b/version/0.2.5/INSTALL.sh index 92d42fa0..add02b01 100644 --- a/version/0.2.5/INSTALL.sh +++ b/version/0.2.5/INSTALL.sh @@ -44,6 +44,7 @@ REPAIR=false LOCALES=true #only en NO_SSH=false #deny port 22 INSTALL_FTP=false #no ui +INSTALL_MAIL=false #no ui OVERLAY=false # needed for ubuntu24 and debian12 IPSETS=true #currently only with ufw SET_HOSTNAME_NOW=false #FQDN @@ -218,6 +219,7 @@ set_premium_features configure_nginx docker_compose_up # must be after nginx setup configure_modsecurity +##### NOT PRODUCTION READY #setup_email setup_ftp set_custom_hostname generate_and_set_ssl_for_panels @@ -323,13 +325,14 @@ parse_args() { echo " --overlay2 Enable overlay2 storage driver instead of device-mapper." echo " --skip-firewall Skip installing UFW or CSF - Only do this if you will set another external firewall!" echo " --csf Install and setup ConfigServer Firewall (default from >0.2.3)" - echo " --ufw Install and setup Uncomplicated Firewall (was default on <0.2.3)" + echo " --ufw Install and setup Uncomplicated Firewall (was default in <0.2.3)" echo " --skip-images Skip installing openpanel/nginx and openpanel/apache docker images." echo " --skip-blacklists Do not set up IP sets and blacklists." echo " --skip-ssl Skip SSL setup." echo " --with_modsec Enable ModSecurity for Nginx." echo " --no-ssh Disable port 22 and whitelist the IP address of user installing the panel." echo " --enable-ftp Install FTP (experimental)." + echo " --enable-mail Install Mail (experimental)." echo " --post_install= Specify the post install script path." echo " --screenshots= Set the screenshots API URL." echo " --swap=<2> Set space in GB to be allocated for SWAP." @@ -411,6 +414,9 @@ while [[ $# -gt 0 ]]; do --enable-ftp) INSTALL_FTP=true ;; + --enable-mail) + INSTALL_MAIL=true + ;; --post_install=*) post_install_path="${1#*=}" ;; @@ -639,6 +645,13 @@ setup_ftp() { +setup_email() { + if [ "$INSTALL_MAIL" = true ]; then + echo "Installing experimental Email service." + curl -sSL https://raw.githubusercontent.com/stefanpejcic/OpenMail/master/setup.sh | bash --dovecot + fi +} + setup_firewall_service() { if [ -z "$SKIP_FIREWALL" ]; then @@ -1177,6 +1190,14 @@ download_skeleton_directory_from_github(){ echo "Downloading configuration files to ${ETC_DIR}" echo "" git clone https://github.com/stefanpejcic/openpanel-configuration ${ETC_DIR} > /dev/null 2>&1 + + + # FOR 0.2.6 ONLY! + #cp -fr /etc/openpanel/services/floatingip.service ${SERVICES_DIR}floatingip.service > /dev/null 2>&1 + #systemctl daemon-reload > /dev/null 2>&1 + #service floatingip start > /dev/null 2>&1 + #systemctl enable floatingip > /dev/null 2>&1 + }