Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Sep 2018 21:27:07 +0000 (UTC)
From:      Jeremie Le Hen <jlh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480630 - in head: . www/libresonic-standalone/files
Message-ID:  <201809242127.w8OLR7Uj043837@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jlh (src committer)
Date: Mon Sep 24 21:27:07 2018
New Revision: 480630
URL: https://svnweb.freebsd.org/changeset/ports/480630

Log:
  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@

Modified:
  head/UPDATING
  head/www/libresonic-standalone/files/libresonic.in

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Sep 24 20:50:24 2018	(r480629)
+++ head/UPDATING	Mon Sep 24 21:27:07 2018	(r480630)
@@ -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

Modified: head/www/libresonic-standalone/files/libresonic.in
==============================================================================
--- head/www/libresonic-standalone/files/libresonic.in	Mon Sep 24 20:50:24 2018	(r480629)
+++ head/www/libresonic-standalone/files/libresonic.in	Mon Sep 24 21:27:07 2018	(r480630)
@@ -23,18 +23,7 @@
 #
 # 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.
 #   Specify the last part of the Libresonic URL, typically "/" or "/libresonic".
@@ -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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809242127.w8OLR7Uj043837>