Reconfigure server package to deploy to /srv/mauvealert

3 files changed, 40 insertions, 59 deletions

diff --git a/Gemfile b/Gemfile
index 7d58599..8acb3ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "ruby_protobuf",  "= 0.4.11"
+gem "ruby_protobuf",  "~> 0.4.11"
 gem "datamapper"
 gem "dm-aggregates"
 gem "dm-do-adapter"
@@ -11,30 +11,28 @@ gem "dm-transactions"
 gem "dm-types"
 gem "dm-validations"
 
-# 
+#
 # The versions here are to match Jessie
 #
-group :development do
-  gem "log4r",     "= 1.1.10"
-  gem "ipaddress", "= 0.8.0"
-  gem "json",      "= 1.8.1"
-  gem "sanitize",  "= 2.1.0"
-  gem "rmail",     "= 1.1.0"
-  gem "thin",      "= 1.6.3"
-  gem "haml",       "= 4.0.5"
-  gem "haml-contrib", "= 1.0.0"
-  gem "RedCloth",   "= 4.2.9"
-  gem "rack",       "= 1.5.2"
-  gem "rack-protection", "= 1.5.2"
-  gem "rack-flash3", "= 1.0.5"
-  gem "tilt",        "= 1.4.1"
-  gem "sinatra",     "= 1.4.5"
-  gem "locale",      "= 2.1.0"
-end
+gem "log4r",     "~> 1.1.10"
+gem "ipaddress", "~> 0.8.0"
+gem "json",      "~> 1.8.1"
+gem "sanitize",  "~> 2.1.0"
+gem "rmail",     "~> 1.1.0"
+gem "thin",      "~> 1.6.3"
+gem "haml",       "~> 4.0.5"
+gem "haml-contrib", "~> 1.0.0"
+gem "RedCloth",   "~> 4.2.9"
+gem "rack",       "~> 1.5.2"
+gem "rack-protection", "~> 1.5.2"
+gem "rack-flash3", "~> 1.0.5"
+gem "tilt",        "~> 1.4.1"
+gem "sinatra",     "~> 1.4.5"
+gem "locale",      "~> 2.1.0"
 
 group :test do
   gem "simplecov", :require => false
-  gem "rack-test", "= 0.6.3"
-  gem "webmock",   "= 1.19.0"
-  gem "timecop",   "= 0.7.1"
+  gem "rack-test", "~> 0.6.3"
+  gem "webmock",   "~> 1.19.0"
+  gem "timecop",   "~> 0.7.1"
 end
diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install
index 6d5dddf..95dce77 100644
--- a/debian/mauvealert-server.install
+++ b/debian/mauvealert-server.install
@@ -1,36 +1,7 @@
-bin/mauveserver                      usr/sbin/
-bin/mauveconsole                     usr/sbin/
-lib/dm-sqlite-adapter-with-mutex.rb  usr/lib/ruby/vendor_ruby/
-lib/dm-validations-with-empty-errors-hack.rb  usr/lib/ruby/vendor_ruby/
-lib/mauve/alert.rb                   usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/alert_changed.rb           usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/alert_group.rb             usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/authentication.rb           usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/calendar_interface.rb      usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/configuration.rb           usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/configuration_builder.rb   usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/configuration_builders.rb  usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/configuration_builders     usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/datamapper.rb              usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/generic_http_api_client.rb usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/heartbeat.rb               usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/history.rb                 usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/http_server.rb             usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/mauve_thread.rb            usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/notification.rb            usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/notifier.rb                usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/notifiers                  usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/notifiers.rb               usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/people_list.rb             usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/person.rb                  usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/processor.rb               usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/server.rb                  usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/source_list.rb             usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/udp_server.rb              usr/lib/ruby/vendor_ruby/mauve/
-lib/mauve/web_interface.rb           usr/lib/ruby/vendor_ruby/mauve/
-lib/object_builder.rb                usr/lib/ruby/vendor_ruby/
-lib/sinatra-partials.rb              usr/lib/ruby/vendor_ruby/
-static                               usr/share/mauvealert
-views                                usr/share/mauvealert
-etc/mauveserver.conf                 etc/mauvealert/
-
+bin                      srv/mauvealert
+lib                      srv/mauvealert
+static                   srv/mauvealert
+views                    srv/mauvealert
+vendor                   srv/mauvealert
+.bundle                  srv/mauvealert
+etc/mauveserver.conf     etc/mauvealert/
diff --git a/debian/rules b/debian/rules
index 5289f9d..04033e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,17 @@
 #!/usr/bin/make -f
   
+# Ugh
+export GEM_HOME := $(shell pwd)/vendor/bundle
+export PATH     := ${GEM_HOME}/bin:${PATH}
+
 %:
-	dh $@ --with systemd
+	dh $@ --with-systemd
+
+override_dh_auto_build:
+	gem install bundler
+	bundler install --deployment --without="test development" --jobs=4
+
+override_dh_clean:
+	dh_clean
+	$(RM) -r vendor/