Merge branch '2.5.x-installer' into saas-installer-albert

Conflicts:
	python_apps/pypo/pypo/pypofile.py

python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py

@@ -1,4 +1,5 @@
 import logging
+import os
 import sys
 import time
 import traceback
@@ -28,7 +29,9 @@ def generate_liquidsoap_config(ss):
         # ignore squashes unused variable errors from Liquidsoap
         fh.write(("ignore(%s)\n" % key).encode('utf-8'))
 
+    auth_path = os.path.dirname(os.path.realpath(__file__))
     fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
+    fh.write('auth_path = "%s/liquidsoap_auth.py"\n' % auth_path)
     fh.close()
     
 def run():