xenial related changes, mostly.

kaltura · Jun 20, 2017 · 63e06c9 · 63e06c9
1 parent 3c72d7d
commit 63e06c9
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 95 deletions.
diff --git a/deb/kaltura-base/debian/control b/deb/kaltura-base/debian/control
@@ -8,7 +8,7 @@ Architecture: all
 Depends: 
  ${shlibs:Depends},
  rsync,
- mysql-client|mariadb-client,
+ mysql-client|mariadb-client|mysql-client-5.6,
  cron,
  ntp,
  mail-transport-agent,

diff --git a/deb/kaltura-base/debian/postinst b/deb/kaltura-base/debian/postinst
@@ -37,9 +37,10 @@ if [ -r $KALTURA_PREFIX/bin/kaltura-base-upgrading ];then
                 fi
                 sed -i "s@^\(kaltura_version\).*@\1 = $KALTURA_VERSION@g" $KALTURA_PREFIX/app/configurations/local.ini
                 echo "Regenarating client libs.. this will take up to 2 minutes to complete."
-                if service apache2 status;then
-                        service apache2 stop
-                        service monit stop
+		# stupidly and only for apache2, service apache2 status outputs to PAGER, thus no good for auto upgrades
+                if /etc/init.d/apache2 status ;then
+                        invoke-rc.d apache2 stop
+                        invoke-rc.d monit stop
 			RESTART_APACHE=true
                 fi
                 # this is read by kaltura-sphinx-schema-update.sh to determine rather or not to run
@@ -52,9 +53,9 @@ if [ -r $KALTURA_PREFIX/bin/kaltura-base-upgrading ];then
                 chmod 775 $KALTURA_PREFIX/web/content
 
                 if [ -n "$RESTART_APACHE" ];then
-                        service apache2 start
+                        invoke-rc.d apache2 start
                 fi
-                service monit start
+                invoke-rc.d monit start
 		sleep 70
                 # we now need CREATE and DROP priv for 'kaltura' on kaltura.*
                 if [ -r /etc/kaltura.d/system.ini ];then
@@ -495,31 +496,28 @@ if [ "$1" = "configure" ]; then
         fi
 
         #db_input critical 'kaltura-base/generating_client_libs' || true
-	if service apache2 status;then
-		service apache2 stop
+	# stupidly and only for apache2, service apache2 status outputs to PAGER, thus no good for auto upgrades
+	if /etc/init.d/apache2 status ;then
+		invoke-rc.d apache2 stop
 		RESTART_APACHE=true
-		service monit stop
+		invoke-rc.d monit stop
 	fi
         rm -rf $KALTURA_PREFIX/app/cache/*
         php $BASE_DIR/app/generator/generate.php >> $BASE_DIR/log/generate.php.log 2>&1
 
 	if [ -n "$RESTART_APACHE" ];then
-		service apache2 start
+		invoke-rc.d apache2 start
 	fi
         set +e
 
 
         ln -sf $BASE_DIR/app/configurations/logrotate/kaltura_base /etc/logrotate.d/
         ln -sf $BASE_DIR/app/configurations/logrotate/kaltura_api /etc/logrotate.d/
-	if [ -d "/etc/php5/mods-available" ];then
-        	ln -sf $APP_DIR/configurations/php/kaltura.ini /etc/php5/mods-available/zz-kaltura.ini
-	fi
-	if [ -d "/etc/php/7.0/mods-available" ];then
-        	ln -sf $APP_DIR/configurations/php/kaltura.ini /etc/php/7.0/mods-available/zz-kaltura.ini
-	fi
-	if [ -d "/opt/kaltura/app/configurations/php/mods-available" ];then
-        	ln -sf $APP_DIR/configurations/php/kaltura.ini /opt/kaltura/app/configurations/php/mods-available/zz-kaltura.ini
-	fi
+	for MOD_DIR in /etc/php5/mods-available /etc/php/7.0/mods-available /opt/kaltura/app/configurations/php/mods-available;do
+		if [ -d "$MOD_DIR" ];then
+        		ln -sf $APP_DIR/configurations/php/kaltura.ini $MOD_DIR/zz-kaltura.ini
+		fi
+	done
         touch  "$BASE_DIR/app/base-config.lock"
 
         find $BASE_DIR/app/cache/ $BASE_DIR/log -type d -exec chmod 775 {} \; 

diff --git a/deb/kaltura-batch/debian/postinst b/deb/kaltura-batch/debian/postinst
@@ -65,6 +65,9 @@ ln -sf $APP_DIR/configurations/logrotate/kaltura_apps /etc/logrotate.d/
 if [ -x "`which php5enmod 2>/dev/null`" ];then
 	php5enmod zz-kaltura
 fi
+if [ -x "`which phpenmod 2>/dev/null`" ];then
+	phpenmod zz-kaltura
+fi
 if [ -x /opt/kaltura/bin/php7enmod ];then
 	/opt/kaltura/bin/php7enmod zz-kaltura
 fi
@@ -74,19 +77,20 @@ find $BASE_DIR/app/cache/ $BASE_DIR/log -type d -exec chmod 775 {} \;
 find $BASE_DIR/app/cache/ $BASE_DIR/log -type f -exec chmod 664 {} \; 
 chown $KALTURA_USER.$APACHE_GROUP $BASE_DIR/app/cache/ $BASE_DIR/log/* $WEB_DIR/content/entry $BASE_DIR/var/run
 
-if service apache2 status >/dev/null 2>&1;then
-	service apache2 reload
+# stupidly and only for apache2, service apache2 status outputs to PAGER, thus no good for auto upgrades
+if /etc/init.d/apache2 status >/dev/null 2>&1;then
+	invoke-rc.d apache2 reload
 else
-	service apache2 start
+	invoke-rc.d apache2 start
 fi
 
-/etc/init.d/kaltura-batch stop >/dev/null 2>&1 || true
-/etc/init.d/kaltura-batch start
+invoke-rc.d kaltura-batch stop >/dev/null 2>&1 || true
+invoke-rc.d kaltura-batch start
 ln -sf $BASE_DIR/app/configurations/monit/monit.d/batch.rc /etc/monit/conf.d/
 ln -sf $BASE_DIR/app/configurations/monit/monit.d/httpd.rc /etc/monit/conf.d/apache2.rc
 ln -sf $BASE_DIR/app/configurations/monit/monit.d/memcached.rc /etc/monit/conf.d/
-service monit stop >> /dev/null 2>&1 || true
-service monit start
+invoke-rc.d monit stop >> /dev/null 2>&1 || true
+invoke-rc.d monit start
 
 send_install_becon `basename $0` $TIMEZ install_success 0 
 
diff --git a/deb/kaltura-ffmpeg/debian/control b/deb/kaltura-ffmpeg/debian/control
@@ -72,11 +72,13 @@ Depends:
  libspeex1,
  libtheora0,
  libva1,
+ libva-drm1, 
+ libva-x11-1,
  libvpx1|libvpx3,
  libxvidcore4,
  libvorbis0a, 
  libvorbisenc2, 
- libx265-87|libx265-79,
+ x265|libx265-87|libx265-79,
  libvorbisfile3
 Description: 
  FFmpeg is a very fast video and audio converter. It can also grab from a

diff --git a/deb/kaltura-front/debian/postinst b/deb/kaltura-front/debian/postinst
@@ -193,6 +193,9 @@ if [ "$1" = "configure" ]; then
 	if [ -x "`which php5enmod 2>/dev/null`" ];then
 		php5enmod zz-kaltura
 	fi
+	if [ -x "`which phpenmod 2>/dev/null`" ];then
+		phpenmod zz-kaltura
+	fi
 	if [ -x /opt/kaltura/bin/php7enmod ];then
 		/opt/kaltura/bin/php7enmod zz-kaltura
 	fi

diff --git a/deb/kaltura-html5lib/debian/control b/deb/kaltura-html5lib/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jess Portnoy <jess.portnoy@kaltura.com>
 
 Package: kaltura-html5lib
 Architecture: all
-Depends: ${shlibs:Depends},apache2-mpm-prefork,libapache2-mod-php5|kaltura-libapache2-mod-php7, kaltura-base
+Depends: ${shlibs:Depends},apache2-mpm-prefork|apache2-bin,libapache2-mod-php5|libapache2-mod-php|kaltura-libapache2-mod-php7, kaltura-base
 Description: Kaltura Open Source Video Platform - HTML5 player 
  Kaltura is the world's first Open Source Online Video Platform, transforming the way people work, learn, 
  and entertain using online video. The Kaltura platform empowers media applications with advanced video 

diff --git a/deb/kaltura-html5lib/debian/rules b/deb/kaltura-html5lib/debian/rules
@@ -3,7 +3,7 @@
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 RC_FILE :=../../build/sources.rc
 HTML5LIB_LATEST_VERSION ?= $(shell egrep '^HTML5LIB_LATEST_VERSION=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
-HTML5LIB_VERSIONS ?= $(shell egrep '^HTML5LIB_PREV_VERSIONS=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
+HTML5LIB_VERSIONS ?= $(shell egrep '^HTML5LIB_VERSIONS=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
 RPM_SOURCES_DIR ?= $(shell egrep '^RPM_SOURCES_DIR=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
 KALTURA_PREFIX ?= $(shell egrep '^KALTURA_PREFIX=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
 HTML5LIB_PREFIX=$(KALTURA_PREFIX)/web/html5/html5lib
@@ -21,27 +21,9 @@ $(archive):
 
 $(tree): $(archive)
 	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-$(HTML5LIB_LATEST_VERSION).tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.46.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.45.1.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.45.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.44.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.43.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.42.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.41.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.40.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.39.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.38.1.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.38.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.37.3.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.37.1.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.36.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.35.5.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.34.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.33.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.32.1.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.31.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.30.tar.gz
-	tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-v2.29.tar.gz
+	for HTML5_VER in $(HTML5LIB_VERSIONS);do \
+		tar zxf $(RPM_SOURCES_DIR)/kaltura-html5lib-$$HTML5_VER.tar.gz; \
+	done
 
 build: $(tree)
 
@@ -52,53 +34,15 @@ binary-indep: install
 	rm -rf $(HTML5LIB_PREFIX)
 	mkdir -p $(HTML5LIB_PREFIX)
 	find kaltura-html5lib-* -name Widevine -exec rm -rf {} \; || true
-	find kaltura-html5lib-* -name UiConfResult.php  -exec cp debian/UiConfResult.php {} \; || true
-	find kaltura-html5lib-* -name simplePhpXMLProxy.php  -exec cp debian/simplePhpXMLProxy.php {} \; || true
 	mv kaltura-html5lib-$(HTML5LIB_LATEST_VERSION) $(HTML5LIB_PREFIX)/$(HTML5LIB_LATEST_VERSION)
-	mv kaltura-html5lib-v2.29 $(HTML5LIB_PREFIX)/v2.29
-	mv kaltura-html5lib-v2.30 $(HTML5LIB_PREFIX)/v2.30
-	mv kaltura-html5lib-v2.31 $(HTML5LIB_PREFIX)/v2.31
-	mv kaltura-html5lib-v2.32.1 $(HTML5LIB_PREFIX)/v2.32.1
-	mv kaltura-html5lib-v2.33 $(HTML5LIB_PREFIX)/v2.33
-	mv kaltura-html5lib-v2.34 $(HTML5LIB_PREFIX)/v2.34
-	mv kaltura-html5lib-v2.35.5 $(HTML5LIB_PREFIX)/v2.35.5
-	mv kaltura-html5lib-v2.36 $(HTML5LIB_PREFIX)/v2.36
-	mv kaltura-html5lib-v2.37.1 $(HTML5LIB_PREFIX)/v2.37.1
-	mv kaltura-html5lib-v2.37.3 $(HTML5LIB_PREFIX)/v2.37.3
-	mv kaltura-html5lib-v2.38 $(HTML5LIB_PREFIX)/v2.38
-	mv kaltura-html5lib-v2.38.1 $(HTML5LIB_PREFIX)/v2.38.1
-	mv kaltura-html5lib-v2.39 $(HTML5LIB_PREFIX)/v2.39
-	mv kaltura-html5lib-v2.40 $(HTML5LIB_PREFIX)/v2.40
-	mv kaltura-html5lib-v2.41 $(HTML5LIB_PREFIX)/v2.41
-	mv kaltura-html5lib-v2.42 $(HTML5LIB_PREFIX)/v2.42
-	mv kaltura-html5lib-v2.43 $(HTML5LIB_PREFIX)/v2.43
-	mv kaltura-html5lib-v2.44 $(HTML5LIB_PREFIX)/v2.44
-	mv kaltura-html5lib-v2.45 $(HTML5LIB_PREFIX)/v2.45
-	mv kaltura-html5lib-v2.45.1 $(HTML5LIB_PREFIX)/v2.45.1
-	mv kaltura-html5lib-v2.46 $(HTML5LIB_PREFIX)/v2.46
 	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/$(HTML5LIB_LATEST_VERSION)/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.29/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.30/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.31/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.32.1/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.33/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.34/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.35.5/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.36/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.37.1/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.37.3/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.38/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.38.1/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.39/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.40/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.41/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.42/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.43/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.44/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.45/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.45.1/
-	cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/v2.46/
-	mkdir $(HTML5LIB_PREFIX)/$(HTML5LIB_LATEST_VERSION)/cache $(HTML5LIB_PREFIX)/v2.35.5/cache $(HTML5LIB_PREFIX)/v2.36/cache $(HTML5LIB_PREFIX)/v2.37.1/cache $(HTML5LIB_PREFIX)/v2.37.3/cache $(HTML5LIB_PREFIX)/v2.38/cache $(HTML5LIB_PREFIX)/v2.38.1/cache $(HTML5LIB_PREFIX)/v2.39/cache $(HTML5LIB_PREFIX)/v2.40/cache $(HTML5LIB_PREFIX)/v2.41/cache $(HTML5LIB_PREFIX)/v2.42/cache $(HTML5LIB_PREFIX)/v2.43/cache $(HTML5LIB_PREFIX)/v2.44/cache $(HTML5LIB_PREFIX)/v2.45/cache $(HTML5LIB_PREFIX)/v2.45.1/cache $(HTML5LIB_PREFIX)/v2.46/cache $(HTML5LIB_PREFIX)/v2.34/cache $(HTML5LIB_PREFIX)/v2.33/cache $(HTML5LIB_PREFIX)/v2.32.1/cache $(HTML5LIB_PREFIX)/v2.31/cache $(HTML5LIB_PREFIX)/v2.30/cache $(HTML5LIB_PREFIX)/v2.29/cache
+	mkdir $(HTML5LIB_PREFIX)/$(HTML5LIB_LATEST_VERSION)/cache 
+	for HTML5_VER in $(HTML5LIB_VERSIONS);do \
+		mv kaltura-html5lib-$$HTML5_VER $(HTML5LIB_PREFIX)/$$HTML5_VER; \
+		cp debian/LocalSettings.php $(HTML5LIB_PREFIX)/$$HTML5_VER/; \
+		cp debian/simplePhpXMLProxy.php $(HTML5LIB_PREFIX)/; \
+		mkdir $(HTML5LIB_PREFIX)/$$HTML5_VER/cache; \
+	done
 	dh_install $(KALTURA_PREFIX)
 	dh_gencontrol -u-v$(DEB_VERSION) 
 	dh_installdebconf