Use ondemand-nginx and ondemand-passenger with deb packages (#1567)

* Use ondemand-nginx and ondemand-passenger with deb packages

* Use new release file

packaging/deb/control

@@ -11,7 +11,8 @@ Package: ondemand
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends},
-  ruby, apache2, sudo, nodejs, lsof, lua-posix
+  ruby, apache2, sudo, nodejs, lsof, lua-posix,
+  ondemand-nginx (= 1.20.1), ondemand-passenger (= 6.0.11)
 Description: Open OnDemand is an open source release of the Ohio SuperComputer Center's
   OnDemand platform to provide HPC access via a web browser, supporting web based file
   management, shell access, job submission and interactive work on compute nodes.

packaging/deb/rules

@@ -23,14 +23,10 @@ override_dh_auto_build:
 	rake --trace -mj$(NCPUS) build
 	rm -rf $(GEM_HOME)/cache
 	rm -rf apps/*/node_modules/.cache
-	rake --trace build:nginx
-	rake --trace build:passenger
 
 override_dh_auto_install:
 	env
 	rake --trace install
-	rake --trace install:nginx
-	rake --trace install:passenger
 
 	# install gems
 	mkdir -p $(DESTDIR)/opt/ood/gems
@@ -69,8 +65,6 @@ override_dh_auto_install:
 	install -D -m 644 $(FILESDIR)/logo.png $(APACHE_DIR)/public/logo.png
 	install -D -m 644 $(FILESDIR)/favicon.ico $(APACHE_DIR)/public/favicon.ico
 
-	mkdir -p $(DESTDIR)/var/lib/ondemand-nginx
-	mkdir -p $(DESTDIR)/var/log/ondemand-nginx
 	mkdir -p $(DESTDIR)/var/tmp/ondemand-nginx
 	mkdir -p $(DESTDIR)/var/run/ondemand-nginx
 	mkdir -p $(DESTDIR)/var/lib/ondemand-nginx/config/puns

spec/e2e/e2e_helper.rb

@@ -180,7 +180,7 @@ def install_ondemand
     install_packages(['ondemand', 'ondemand-dex', 'ondemand-selinux'])
   elsif host_inventory['platform'] == 'ubuntu'
     install_packages(['wget'])
-    on hosts, "wget -O /tmp/ondemand-release.deb https://apt.osc.edu/ondemand/latest/ondemand-release-web-latest-#{codename}_1-1_all.deb"
+    on hosts, 'wget -O /tmp/ondemand-release.deb https://yum.osc.edu/ondemand/latest/ondemand-release-web-latest_1_all.deb'
     install_packages(['/tmp/ondemand-release.deb'])
     on hosts, 'apt-get update'
     install_packages(['ondemand', 'ondemand-dex'])