From df2bd8794275d4fd9ac6c107e0a5854e405440a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 19 Sep 2016 16:36:47 +0200 Subject: [PATCH] NOW: finalize packaging, apache2 subpackage. --- NOW/debian/control | 18 ++++++++++++++++-- NOW/debian/docs | 4 ++++ NOW/debian/now-apache.apache2 | 2 ++ NOW/debian/now-apache.conf | 1 + NOW/debian/now-apache.dirs | 1 + NOW/debian/now.conf | 14 ++++++++++++++ NOW/debian/now.install | 8 ++++++++ NOW/debian/rules | 11 +++++++++++ 8 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 NOW/debian/now-apache.apache2 create mode 100644 NOW/debian/now-apache.conf create mode 100644 NOW/debian/now-apache.dirs create mode 100644 NOW/debian/now.conf create mode 100644 NOW/debian/now.install diff --git a/NOW/debian/control b/NOW/debian/control index 9e537b7..880a373 100644 --- a/NOW/debian/control +++ b/NOW/debian/control @@ -2,18 +2,32 @@ Source: now Section: ruby Priority: optional Maintainer: František Dvořák -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~) +Build-Depends: debhelper (>= 7.0.50~), dh-apache2, gem2deb (>= 0.6.1~) Standards-Version: 3.9.5 Homepage: https://github.com/CESNET/NOW #Vcs-Git: git://git.debian.org/collab-maint/now.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/now.git;a=summary +Vcs-Browser: http://scientific.zcu.cz/git/?p=packaging-deb-NOW.git;a=summary XS-Ruby-Versions: all Package: now Architecture: all XB-Ruby-Versions: ${ruby:Versions} Pre-Depends: ${misc:Pre-Depends}, adduser -Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-ipaddress, ruby-json, ruby-sinatra, ruby-sinatra-cross-origin +Depends: ${misc:Depends}, libjs-jquery, ruby | ruby-interpreter, ruby-ipaddress, ruby-json, ruby-sinatra, ruby-sinatra-cross-origin +# missing: ruby-libopennebula +Suggests: now-apache Description: Network Orchestrator Wrapper for OpenNebula Network Orchestrator Wrapper is the component to extend OpenNebula network orchestration capabilities. + +Package: now-apache +Architecture: all +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, now (>= ${source:Version}), apache2-mpm-worker, libapache2-mod-passenger +Description: Network Orchestrator Wrapper with configurations for Apache + Network Orchestrator Wrapper is the component to extend OpenNebula network + orchestration capabilities. + . + This package contains configuration files, setup scripts, and dependencies for + running NOW in Apache. diff --git a/NOW/debian/docs b/NOW/debian/docs index b43bf86..799b807 100644 --- a/NOW/debian/docs +++ b/NOW/debian/docs @@ -1 +1,5 @@ +etc/ +Gemfile.devel README.md +swagger.yaml +debian/tmp/rdoc/ diff --git a/NOW/debian/now-apache.apache2 b/NOW/debian/now-apache.apache2 new file mode 100644 index 0000000..78bd8bc --- /dev/null +++ b/NOW/debian/now-apache.apache2 @@ -0,0 +1,2 @@ +conf debian/now-apache.conf +site debian/now.conf diff --git a/NOW/debian/now-apache.conf b/NOW/debian/now-apache.conf new file mode 100644 index 0000000..551131d --- /dev/null +++ b/NOW/debian/now-apache.conf @@ -0,0 +1 @@ +Listen localhost:11080 diff --git a/NOW/debian/now-apache.dirs b/NOW/debian/now-apache.dirs new file mode 100644 index 0000000..719aa4b --- /dev/null +++ b/NOW/debian/now-apache.dirs @@ -0,0 +1 @@ +usr/share/NOW/public diff --git a/NOW/debian/now.conf b/NOW/debian/now.conf new file mode 100644 index 0000000..fe9ddb4 --- /dev/null +++ b/NOW/debian/now.conf @@ -0,0 +1,14 @@ + + LogLevel info + + DocumentRoot /usr/share/NOW/public + + #apache 2.2: Allow from all + Require all granted + Options -MultiViews + + + PassengerUser now + PassengerGroup now + PassengerMinInstances 3 + diff --git a/NOW/debian/now.install b/NOW/debian/now.install new file mode 100644 index 0000000..bb8dade --- /dev/null +++ b/NOW/debian/now.install @@ -0,0 +1,8 @@ +lib/ usr/share/NOW/ +models/ usr/share/NOW/ +spec/ usr/share/NOW/ +templates/ usr/share/NOW/ +test/ usr/share/NOW/ +etc/now.yml etc/ +*.rb usr/share/NOW/ +config.ru usr/share/NOW/ diff --git a/NOW/debian/rules b/NOW/debian/rules index 4e193bf..8f36812 100755 --- a/NOW/debian/rules +++ b/NOW/debian/rules @@ -2,6 +2,17 @@ export DH_VERBOSE=1 # rspec >= 3 required export DH_RUBY_IGNORE_TESTS=all +export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=1 %: dh $@ --buildsystem=ruby --with ruby + +override_dh_install: + rdoc --op debian/tmp/rdoc/ models/ lib/ *.rb README* + rm debian/tmp/rdoc/js/jquery.js + ln -s /usr/share/javascript/jquery/jquery.js debian/tmp/rdoc/js/ + dh_apache2 -pnow-apache + dh_install + +override_dh_installdocs: + dh_installdocs --link-doc=now -- 1.8.2.3