Optimised OMV install with some performance boost.

softy

@@ -281,36 +281,68 @@ fi
 
 install_omv (){
 #------------------------------------------------------------------------------------------------------------------------------------------
-# Install high-performance HTTP accelerator
+# Install OpenMediaVault 3
 #------------------------------------------------------------------------------------------------------------------------------------------
-if [[ $family == "Ubuntu" ]]; then
-	dialog --backtitle "$backtitle" --title "Dependencies not met" --msgbox "\nOpenmediavault can be installed only on Debian." 7 52
-	sleep 5
-	exit
+if [ $distribution != "jessie" ]; then
+    dialog --backtitle "$backtitle" --title "Dependencies not met" --msgbox "\nOpenMediaVault 3 can only be installed on Debian Jessie." 7 52
+    sleep 5
+    exit
 fi
-wget -qO - packages.openmediavault.org/public/archive.key | apt-key add -
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7AA630A1EDEE7D73
+
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7AA630A1EDEE7D73 >/dev/null 2>&1
 
 cat > /etc/apt/sources.list.d/openmediavault.list << EOF
-deb http://packages.openmediavault.org/public erasmus main
+deb https://openmediavault.github.io/packages/ erasmus main
 
 ## Uncomment the following line to add software from the proposed repository.
-# deb http://packages.openmediavault.org/public erasmus-proposed main
-
+deb https://openmediavault.github.io/packages/ erasmus-proposed main
 
 ## This software is not part of OpenMediaVault, but is offered by third-party
 ## developers as a service to OpenMediaVault users.
-
-# deb http://packages.openmediavault.org/public erasmus partner
-
+# deb https://openmediavault.github.io/packages/ erasmus partner
 EOF
+
 debconf-apt-progress -- apt-get update
-debconf-apt-progress -- apt-get -y install openmediavault postfix
-URL='http://omv-extras.org/openmediavault-omvextrasorg_latest_all3.deb'; FILE=`mktemp`; wget "$URL" -qO $FILE && dpkg -i $FILE; rm $FILE
+debconf-apt-progress -- apt-get --yes --force-yes --allow-unauthenticated install openmediavault-keyring openmediavault postfix
+URL='https://github.com/OpenMediaVault-Plugin-Developers/packages/raw/master/openmediavault-omvextrasorg_latest_all3.deb'; FILE=`mktemp`; wget "$URL" -qO $FILE && dpkg -i $FILE; rm $FILE
 /usr/sbin/omv-update
-apt-get -y install openmediavault-flashmemory
-sed -i '/<flashmemory>/,/<\/flashmemory>/ s/<enable>0/<enable>1/' /etc/openmediavault/config.xml
+
+# Install flashmemory plugin and netatalk by default, use nice logo for the latter,
+# Disable OMV monitoring by default
+. /usr/share/openmediavault/scripts/helper-functions
+apt-get -y -q install openmediavault-netatalk openmediavault-flashmemory
+AFP_Options="mimic model = Macmini"
+SMB_Options="min receivefile size = 16384\nwrite cache size = 524288\ngetwd cache = yes\nsocket options = TCP_NODELAY IPTOS_LOWDELAY"
+xmlstarlet ed -L -u "/config/services/afp/extraoptions" -v "$(echo -e "${AFP_Options}")" /etc/openmediavault/config.xml
+xmlstarlet ed -L -u "/config/services/smb/extraoptions" -v "$(echo -e "${SMB_Options}")" /etc/openmediavault/config.xml
+xmlstarlet ed -L -u "/config/services/flashmemory/enable" -v "1" /etc/openmediavault/config.xml
+xmlstarlet ed -L -u "/config/services/ssh/enable" -v "1" /etc/openmediavault/config.xml
+xmlstarlet ed -L -u "/config/services/ssh/permitrootlogin" -v "1" /etc/openmediavault/config.xml
+xmlstarlet ed -L -u "/config/system/time/ntp/enable" -v "1" /etc/openmediavault/config.xml
+read TZ </etc/timezone
+xmlstarlet ed -L -u "/config/system/time/timezone" -v "${TZ}" /etc/openmediavault/config.xml
+read HOSTNAME </etc/hostname
+xmlstarlet ed -L -u "/config/system/network/dns/hostname" -v "${HOSTNAME}" /etc/openmediavault/config.xml
+/usr/sbin/omv-rpc -u admin "perfstats" "set" '{"enable":false}'
+/usr/sbin/omv-rpc -u admin "config" "applyChanges" '{ "modules": ["monit","rrdcached","collectd"],"force": true }'
+sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached
+/usr/sbin/omv-mkconf netatalk
+/usr/sbin/omv-mkconf samba
 /usr/sbin/omv-mkconf flashmemory
+/usr/sbin/omv-mkconf ssh
+/usr/sbin/omv-mkconf ntp
+/usr/sbin/omv-mkconf timezone
+/usr/sbin/omv-mkconf monit
+/usr/sbin/omv-mkconf rrdcached
+/usr/sbin/omv-mkconf collectd
+/sbin/folder2ram -enablesystemd
+
+# Prevent accidentally destroying board performance by clicking around in OMV UI
+. /etc/default/cpufrequtils
+echo -e "OMV_CPUFREQUTILS_GOVERNOR=${GOVERNOR}" >>/etc/default/openmediavault
+echo -e "OMV_CPUFREQUTILS_MINSPEED=${MIN_SPEED}" >>/etc/default/openmediavault
+echo -e "OMV_CPUFREQUTILS_MAXSPEED=${MAX_SPEED}" >>/etc/default/openmediavault
+
 omv-initsystem
 check_port 80
 }