diff --git a/fontconfig-2.13.94_1.1.txz b/fontconfig-2.13.94_1.1.txz new file mode 100644 index 0000000..b615056 Binary files /dev/null and b/fontconfig-2.13.94_1.1.txz differ diff --git a/install-unifi/install-unifi.sh b/install-unifi/install-unifi.sh index 97ce379..337967f 100644 --- a/install-unifi/install-unifi.sh +++ b/install-unifi/install-unifi.sh @@ -8,7 +8,7 @@ UNIFI_SOFTWARE_URL="https://dl.ui.com/unifi/7.2.92/UniFi.unix.zip" # The rc script associated with this branch or fork: -RC_SCRIPT_URL="https://raw.githubusercontent.com/unofficial-unifi/unifi-pfsense/master/rc.d/unifi.sh" +RC_SCRIPT_URL="https://raw.githubusercontent.com/indoes/unifi-pfsense/synced/rc.d/unifi.sh" CURRENT_MONGODB_VERSION=mongodb42 @@ -129,8 +129,10 @@ AddPkg () { #Add the following Packages for installation or reinstallation (if something was removed) AddPkg png +AddPkg brotli AddPkg freetype2 -AddPkg fontconfig +#AddPkg fontconfig +env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg add -f https://github.com/indoes/unifi-pfsense/raw/synced/fontconfig-2.13.94_1.1.txz AddPkg alsa-lib AddPkg mpdecimal AddPkg python37 @@ -155,8 +157,11 @@ AddPkg libXrender AddPkg libinotify AddPkg javavmwrapper AddPkg java-zoneinfo +AddPkg fontconfig AddPkg openjdk8 -AddPkg snappyjava +AddPkg openjdk8-jre +AddPkg bootstrap-openjdk8 +env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg add -f https://github.com/indoes/unifi-pfsense/raw/synced/snappyjava-1.1.7.5.txz AddPkg snappy AddPkg cyrus-sasl AddPkg icu @@ -189,6 +194,11 @@ echo -n "Updating mongod link..." /bin/ln -sf /usr/local/bin/mongod /usr/local/UniFi/bin/mongod echo " done." +# Update openjdk symbolic link for java to point to /usr/local/bin/java: +/bin/unlink /usr/local/bin/java +/bin/ln -sf /usr/local/openjdk8-jre/bin/java /usr/local/bin/java + + # If partition size is < 4GB, add smallfiles option to mongodb echo -n "Checking partition size..." if [ `df -k | awk '$NF=="/"{print $2}'` -le 4194302 ]; then diff --git a/snappyjava-1.1.7.5.txz b/snappyjava-1.1.7.5.txz new file mode 100644 index 0000000..5812f3e Binary files /dev/null and b/snappyjava-1.1.7.5.txz differ