Commit a4d1ba61 authored by john hackett's avatar john hackett
Browse files

Updated cron, email and backup to use gem2deb/dh instead of cdbs.

parent 4a5d8ab7
......@@ -3,16 +3,17 @@ Section: web
Priority: extra
Maintainer: Steve Kemp <steve@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
Build-Depends: debhelper (>= 7.0.0), cdbs
Build-Depends: debhelper (>= 7.0.0), gem2deb
Standards-Version: 3.9.1
XS-Ruby-Versions: all
Package: symbiosis-backup
Replaces: bytemark-vhost-simple-backup
Conflicts: bytemark-vhost-simple-backup
Provides: bytemark-vhost-simple-backup
Architecture: all
Depends: backup2l, ruby, ruby1.8, symbiosis-common (>>2011:1216), ${misc:Depends}
Recommends: libmysql-ruby1.8, libpgsql-ruby1.8
Depends: backup2l, ruby, symbiosis-common (>>2011:1216), ${misc:Depends}
Recommends: ruby-mysql, ruby-pg
Description: Automatically backup your files
This package configures backup2l to backup your data.
.
......
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
#
export DH_VERBOSE=1
#
# Uncomment to ignore all test failures (but the tests will run anyway)
#export DH_RUBY_IGNORE_TESTS=all
#
#
# Uncomment to ignore some test failures (but the tests will run anyway).
# Valid values:
#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
#
# If you need to specify the .gemspec (eg there is more than one)
#export DH_RUBY_GEMSPEC=gem.gemspec
include /usr/share/cdbs/1/rules/debhelper.mk
%:
dh $@ --buildsystem=ruby --with ruby
build/symbiosis-backup::
make all
cleanbuilddir/symbiosis-backup::
make clean
override_dh_auto_build-indep:
$(MAKE) all
override_dh_auto_clean:
$(MAKE) clean
......@@ -16,6 +16,6 @@ wrapper/symbiosis-all-crontabs: wrapper/symbiosis-all-crontabs.c
txt2man -s 1 -t $(basename $(notdir $<)) $< | sed -e 's/\\\\fB/\\fB/' > $@
test:
cd test && ruby1.8 -I ../lib tc_crontab.rb
cd test && ruby -I ../lib tc_crontab.rb
.PHONY: binary clean man all test
......@@ -3,12 +3,13 @@ Section: admin
Priority: extra
Maintainer: Steve Kemp <steve@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
Build-Depends: debhelper (>= 7.0.0), cdbs, txt2man, ruby1.8
Build-Depends: debhelper (>= 7.0.0), txt2man, gem2deb
Standards-Version: 3.9.1
XS-Ruby-Versions: all
Package: symbiosis-cron
Architecture: any
Depends: ruby1.8, cron, ${shlibs:Depends}, ${misc:Depends}
Depends: ruby, cron, ${shlibs:Depends}, ${misc:Depends}
Description: Provide per-domain crontab support
This package provides a setuid wrapper script which allows each hosted
domain to have crontab entries, executed as the appropriate domain owner.
wrapper/symbiosis-all-crontabs /usr/sbin/
bin/* usr/bin/
lib/* usr/lib/ruby/1.8/
test/* etc/symbiosis/test.d/
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
#
export DH_VERBOSE=1
#
# Uncomment to ignore all test failures (but the tests will run anyway)
#export DH_RUBY_IGNORE_TESTS=all
#
#
# Uncomment to ignore some test failures (but the tests will run anyway).
# Valid values:
#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
#
# If you need to specify the .gemspec (eg there is more than one)
#export DH_RUBY_GEMSPEC=gem.gemspec
include /usr/share/cdbs/1/rules/debhelper.mk
%:
dh $@ --buildsystem=ruby --with ruby
build/symbiosis-cron::
make binary
make man
override_dh_auto_build:
$(MAKE) all
cleanbuilddir/symbiosis-cron::
make clean
override_dh_auto_clean:
$(MAKE) clean
......@@ -16,6 +16,6 @@ clean:
test:
make -C exim4/
make -C dovecot/
.PHONY: clean docs all test
......@@ -3,13 +3,13 @@ Section: mail
Priority: extra
Maintainer: Steve Kemp <steve@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
Build-Depends: debhelper (>= 7.0.0), ruby1.8, txt2man
Build-Depends: debhelper (>= 7.0.0), txt2man, exim4-daemon-heavy, dovecot-core, dovecot-managesieved, gem2deb
Standards-Version: 3.9.1
XS-Ruby-Versions: all
Package: symbiosis-email
Architecture: all
Depends: symbiosis-common (>= 2012:0221), exim4-daemon-heavy, dovecot-sieve, dovecot-managesieved, dovecot-imapd, dovecot-pop3d, ruby1.8, adduser, make, clamav-daemon, clamav-freshclam, spamassassin, ${misc:Depends}
Depends: symbiosis-common (>= 2012:0221), exim4-daemon-heavy, dovecot-sieve, dovecot-managesieved, dovecot-imapd, dovecot-pop3d, adduser, make, clamav-daemon, clamav-freshclam, spamassassin, ruby, ${misc:Depends}
Recommends: symbiosis-webmail
Replaces: bytemark-vhost-email, symbiosis-monit (<< 2011:1206), symbiosis-test
Breaks: symbiosis-monit (<< 2011:1206)
......
......@@ -14,11 +14,10 @@ export DH_VERBOSE=1
#export DH_RUBY_GEMSPEC=gem.gemspec
%:
dh $@ --buildsystem=ruby --with ruby
dh $@ --buildsystem=ruby --with ruby
override_dh_auto_build-indep:
$(MAKE) docs
$(MAKE) docs
override_dh_auto_clean:
$(MAKE) clean
$(MAKE) clean
......@@ -5,14 +5,14 @@ snippets_dir := symbiosis.d
snippets := $(shell find $(CURDIR)/$(snippets_dir) -mindepth 1 -regextype posix-basic -type f -regex '.*/[a-z0-9][a-z0-9-]\+' | sort)
ifeq ($(program),dovecot)
check_args = -a -c $(conf_tmp)
test_args = -a -c $(conf_tmp)
else ifeq ($(program),exim4)
check_args = -bV -C $(conf_tmp)
test_args = -bV -C $(conf_tmp)
endif
all: $(conf)
$(conf): check
$(conf): test
@mv -fb $(conf_tmp) $(conf)
#
......@@ -28,8 +28,8 @@ $(conf_tmp): distclean Makefile $(snippets) $(CURDIR)/$(snippets_dir)/00-header
cat $$s >> $(conf_tmp) ;\
done
check: $(conf_tmp)
@/usr/sbin/$(program) $(check_args) > /dev/null
test: $(conf_tmp)
@/usr/sbin/$(program) $(test_args) > /dev/null
distclean:
@rm -f $(conf_tmp)
......@@ -38,6 +38,6 @@ clean:
@rm -f $(conf)
# We always want the temporary config to be remade.
.PHONY: $(conf_tmp) clean distclean check
.PHONY: $(conf_tmp) clean distclean test
.PRECIOUS: $(conf)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment