Remove https support and fix Sprint Boot properties in www/libresonic-standalnone.

HTTPS support will be removed upstream:
https://github.com/Libresonic/libresonic/issues/125#issuecomment-256227104

Sprint Boot properties use the "server" prefix. They are documented here:
https://docs.spring.io/spring-boot/docs/1.4.5.RELEASE/reference/htmlsingle/#boot-features-customizing-embedded-containers

Reported by:	chronic at chronic se (Sprint Boot properties)
Reviewed by:	des@
Approved by:	des@

2 files changed, 24 insertions, 20 deletions

diff --git a/UPDATING b/UPDATING
index 405a2f4fabb3..f0f745b54e40 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20180924:
+  AFFECTS: www/libresonic-standalone
+  AUTHOR: jlh@FreeBSD.org
+
+  HTTPS support has been removed from the port, as it will be removed upstream:
+    https://github.com/Libresonic/libresonic/issues/125#issuecomment-256227104
+
+  In order to avoid strange behavior for users who are using this feature, the
+  rc.d script will fail fast if libresonic_ssl="YES". You should remove the
+  following variables from rc.conf(5): libresonic_ssl libresonic_ssl_keystore
+  libresonic_ssl_password.
+
+  # sed -i '' /libresonic_ssl/d /etc/rc.conf
+
+  Users needing SSL are encouraged to use an HTTP reverse-proxy. Example
+  configurations can be found here:
+    https://github.com/Libresonic/libresonic/issues/119
+
 20180922:
   AFFECTS: users of graphics/ilmbase, graphics/OpenEXR
   AUTHOR: mandree@FreeBSD.org
diff --git a/www/libresonic-standalone/files/libresonic.in b/www/libresonic-standalone/files/libresonic.in
index 045ee8dcda17..29cb51cbe46b 100644
--- a/www/libresonic-standalone/files/libresonic.in
+++ b/www/libresonic-standalone/files/libresonic.in
@@ -23,17 +23,6 @@
 #
 # libresonic_port (int):
 #   Set to "4040" by default.
-#   Specify which port to listen on for HTTP(S).
-#
-# libresonic_ssl (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable SSL.
-#
-# libresonic_ssl_keystore (str):
-#   Optionally set path to custom SSL keystore.
-#
-# libresonic_ssl_password (str):
-#   Optionally set password for custom SSL keystore.
 #
 # libresonic_context_path (str):
 #   Set to "/" by default.
@@ -58,15 +47,13 @@ load_rc_config "${name}"
 : ${libresonic_home:="%%LIBRESONIC_HOME%%"}
 : ${libresonic_host:="0.0.0.0"}
 : ${libresonic_port:="4040"}
-: ${libresonic_ssl:="NO"}
 : ${libresonic_context_path:="/"}
 : ${libresonic_max_memory:="100"}
 
 if checkyesno libresonic_ssl; then
-	LIBRESONIC_SSL_FLAGS="-Dlibresonic.httpsPort=${libresonic_port}" && libresonic_port="0"
-	if [ ! -z ${libresonic_ssl_keystore} ]; then
-		LIBRESONIC_SSL_FLAGS=${LIBRESONIC_SSL_FLAGS}" -Dlibresonic.ssl.keystore=${libresonic_ssl_keystore} -Dlibresonic.ssl.password=${libresonic_ssl_password}"
-	fi
+        err 1 \
+"Libresonic SSL/HTTPS support has been removed.
+Please see entry 20180924 in UPDATING."
 fi
 
 start_precmd="export LC_CTYPE='en_US.UTF-8'"
@@ -74,10 +61,9 @@ libresonic_chdir="%%DATADIR%%"
 command="/usr/sbin/daemon"
 command_args="-f ${procname} \
 	-Dlibresonic.home=${libresonic_home} \
-	-Dlibresonic.host=${libresonic_host} \
-	-Dlibresonic.port=${libresonic_port} \
-	${LIBRESONIC_SSL_FLAGS} \
-	-Dlibresonic.contextPath=${libresonic_context_path} \
+	-Dserver.host=${libresonic_host} \
+	-Dserver.port=${libresonic_port} \
+	-Dserver.contextPath=${libresonic_context_path} \
 	-Dlibresonic.defaultMusicFolder=${libresonic_home}/music \
 	-Dlibresonic.defaultPodcastFolder=${libresonic_home}/Podcast \
 	-Dlibresonic.defaultPlaylistFolder=${libresonic_home}/playlists \