From 5d22979d28a54de51a433c9d2988ed20c698b6aa Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 26 Sep 2013 20:12:15 +0000 Subject: [PATCH] Removed various contractor tools which don't belong in trunk. - Legacy-Id: 6277 --- Capfile | 4 - config/deploy.rb | 113 ------------------ manage | 6 - runserver | 3 - support/common.mk | 9 -- support/deb.mk | 43 ------- support/ietfdb-base/DEBIAN/control | 10 -- support/ietfdb-base/DEBIAN/postinst | 15 --- support/ietfdb-base/DEBIAN/postrm | 9 -- support/ietfdb-base/DEBIAN/preinst | 9 -- support/ietfdb-base/Makefile | 3 - support/ietfdb-base/diversions | 0 .../etc/apache2/conf.d/wsgi.conf-example | 1 - .../etc/ietfdb/ietfdb-requirements.txt | 3 - .../etc/ietfdb/ietfdb-requirements2.txt | 7 -- support/ietfdb-devel/DEBIAN/control | 10 -- support/ietfdb-devel/Makefile | 3 - support/ietfdb-devel/diversions | 0 support/instdeb.mk | 24 ---- support/tools/divert | 77 ------------ 20 files changed, 349 deletions(-) delete mode 100644 Capfile delete mode 100644 config/deploy.rb delete mode 100755 manage delete mode 100755 runserver delete mode 100644 support/common.mk delete mode 100644 support/deb.mk delete mode 100644 support/ietfdb-base/DEBIAN/control delete mode 100755 support/ietfdb-base/DEBIAN/postinst delete mode 100755 support/ietfdb-base/DEBIAN/postrm delete mode 100755 support/ietfdb-base/DEBIAN/preinst delete mode 100644 support/ietfdb-base/Makefile delete mode 100644 support/ietfdb-base/diversions delete mode 100644 support/ietfdb-base/etc/apache2/conf.d/wsgi.conf-example delete mode 100644 support/ietfdb-base/etc/ietfdb/ietfdb-requirements.txt delete mode 100644 support/ietfdb-base/etc/ietfdb/ietfdb-requirements2.txt delete mode 100644 support/ietfdb-devel/DEBIAN/control delete mode 100644 support/ietfdb-devel/Makefile delete mode 100644 support/ietfdb-devel/diversions delete mode 100644 support/instdeb.mk delete mode 100644 support/tools/divert diff --git a/Capfile b/Capfile deleted file mode 100644 index e04728e8d..000000000 --- a/Capfile +++ /dev/null @@ -1,4 +0,0 @@ -load 'deploy' if respond_to?(:namespace) # cap2 differentiator -Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } - -load 'config/deploy' # remove this line to skip loading any of the default tasks \ No newline at end of file diff --git a/config/deploy.rb b/config/deploy.rb deleted file mode 100644 index 75b3f1997..000000000 --- a/config/deploy.rb +++ /dev/null @@ -1,113 +0,0 @@ - -# on development host. -# these will need to be adjusted to the host being deployed to. -set :application, "orlando" -set :user, 'orlando' -set :subdir, "" -set :deploy_to, "/data/#{user}/#{subdir}#{application}" -set :pythonver, "2.6" -set :virtualenv, "/data/pythonenv/IETFDB" -set :use_sudo, false - -# this depends upon the source of the code. -# branch is not as meaningful for SVN. -set :scm_user, ENV['LOGNAME'] -set :ssh_options, { :forward_agent => true } - -# GIT -set :scm, :git -set :branch, 'master' -set :repository, "git+ssh://#{scm_user}@code.gatineau.credil.org/git/orlando/ietfdb" -set :git_enable_submodules, true - -# SVN -#set :scm, :subversion -#set :repository, "http://svn.tools.ietf.org/svn/tools/ietfdb/branch/ssw/agenda/v4.41" - -set :django_environment, "cd #{release_path}" - -# host list -role :web, "orlando.gatineau.credil.org" -role :app, "orlando.gatineau.credil.org" - -namespace :deploy do - -# the untouched "deploy" namespace contains: -# deploy:setup -# deploy:default -# deploy:update -# deploy:update_code -# deploy:finalize_update -# deploy:symlink -# deploy:restart -# -# -# update_code does the actual checkout/clone, then calls finalize_update. So you can override -# finalize_update and still get the checkout and symlink functionality. -# -# setup has to be called separately. - - # this overrides rails specific things. - task :start do ; end - task :stop do ; end - - desc "Setup a new django instance" - task :setup, :roles => [:app,:web] do - setup_deploy_user_home_dir - logdir - end - - - desc "Restart the apache server." - task :restart, :roles => :web, :except => { :no_release => true } do - # something to restart django. - run "sudo /usr/sbin/apache2ctl graceful" - end - - desc "Adjust a newly checked-out release for use." - task :finalize_update, :roles => [:app,:web,:db] do - copy_settings - #compilemessages - run "env" - end - - desc "Copies settings_local.py to the new release." - task :copy_settings, :roles => [:app,:web] do - db_config = "/data/#{user}/settings_local.py" - run "cp #{db_config} #{release_path}/ietf/settings_local.py" - releasenum=File.basename(release_path) - run "echo 'RELEASENUM = \'#{releasenum}\'' >#{release_path}/ietf/releasenum.py" - end - - desc "./manage.py compilemessages in the new release." - task :compilemessages, :roles => [:app,:web] do - #run "chmod 2775 #{release_path}/locale/en/LC_MESSAGES" - #run "chmod 2775 #{release_path}/locale/fr/LC_MESSAGES" - run "#{django_environment} && ./manage compilemessages -v 2" - end - - desc "./manage.py syncdb --noinit in the new release." - task :syncdb, :roles => [:app,:web] do - run "#{django_environment} && ./manage syncdb --noinput" - end - - desc "./manage.py migrate in the new release." - task :migrate, :roles => [:app,:web] do - run "#{django_environment} && ./manage migrate" - end - - desc "Creates the (shared) log directory." - task :logdir, :roles => [:app,:web] do - run "mkdir -p #{deploy_to}/log" - end - - desc "Set up deploy user\'s directory." - task :setup_deploy_user_home_dir, :roles => [:app,:web] do - run "mkdir -p #{deploy_to}" - run "mkdir -p #{deploy_to}/releases" - logdir - run "echo 'Do not forget to copy the settings_local.py to the deploy home dir.'" - end - -end - diff --git a/manage b/manage deleted file mode 100755 index 280ac25fb..000000000 --- a/manage +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -. /data/pythonenv/IETFDB/bin/activate -# clientportal depends upon hacking the base.css, rather than extending it. - -ietf/manage.py $* diff --git a/runserver b/runserver deleted file mode 100755 index 2cd926c41..000000000 --- a/runserver +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -REMOTE_USER=mcr+ietf@sandelman.ca ./manage runserver $* diff --git a/support/common.mk b/support/common.mk deleted file mode 100644 index 9974d8f4c..000000000 --- a/support/common.mk +++ /dev/null @@ -1,9 +0,0 @@ -TOP ?= . -UP = .. - -PKG ?= $(shell grep Package DEBIAN/control | cut -d " " -f2) -WEEK ?= $(shell date +%Y%V) -REV :=$(shell date +%Y%m%d.t%H%M) -VER ?= 3.0.$(REV) -DEB ?= $(PKG)_$(VER).deb -INCOMING ?= credil@galaxy.gatineau.credil.org:/home/credil/incoming diff --git a/support/deb.mk b/support/deb.mk deleted file mode 100644 index 1c3ebeafa..000000000 --- a/support/deb.mk +++ /dev/null @@ -1,43 +0,0 @@ -include $(TOP)/common.mk - -DIRS ?= $(shell find . -maxdepth 1 -type d | grep -v tests | egrep -v '\.$$' | sed 's/\.\///') -SOURCEFILES ?= $(shell find $(DIRS) -type f) - -all : deb - -deb:: $(DEB) - -info : - @echo VER=$(VER) - @echo REV=$(REV) - @echo PKG=$(PKG) - @echo DEB=$(DEB) - @echo GENFILES=$(GENFILES) - @echo DIRS=$(DIRS) - @echo SOURCEFILES=$(SOURCEFILES) | fold -s - -$(DEB):: ${GENFILES} - @rm -rf tmp - @mkdir -p tmp - @cp -r $(DIRS) tmp - @perl -pi \ - -e 's/\$$\(VER\)/'$(VER)'/g;' \ - -e 's/\$$\(WEEK\)/'$(WEEK)'/g;' \ - -e 's/\$$\(REVISION\)/'$(REVISION)'/g;' \ - tmp/DEBIAN/control - @echo Packaging $(DEB) - @fakeroot -u sh -c 'chown -f -R root tmp; dpkg-deb -b tmp $(DEB)' - @rm -rf tmp - -push:: $(DEB) - @scp $(DEB) $(INCOMING) - @if [ -n "$(INCOMING2)" ]; then scp $(DEB) $(INCOMING2); fi - @echo $(DEB) '->' $(INCOMING) $(INCOMING2) - -divert : - perl $(TOP)/tools/divert $(PKG) - -clean:: - @rm -rf *.deb tmp - -.PHONY : all deb push divert clean diff --git a/support/ietfdb-base/DEBIAN/control b/support/ietfdb-base/DEBIAN/control deleted file mode 100644 index 857a931ea..000000000 --- a/support/ietfdb-base/DEBIAN/control +++ /dev/null @@ -1,10 +0,0 @@ -Package: ietf-ietfdb-base -Version: $(VER) -Section: ietf -Priority: optional -Architecture: all -Provides: ietf-ietfdb-base -Depends: python2.6, apache2, python-virtualenv, libmysqlclient-dev, - python2.6-dev -Maintainer: -Description: Installs prerequites for running IETF DB (Datatracker) diff --git a/support/ietfdb-base/DEBIAN/postinst b/support/ietfdb-base/DEBIAN/postinst deleted file mode 100755 index e0da78bf2..000000000 --- a/support/ietfdb-base/DEBIAN/postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ configure = "$1" ]; then - : setup python stuff. - virtualenv=/data/pythonenv/IETFDB - mkdir -p /data/pythonenv - virtualenv -p /usr/bin/python2.6 --no-site-packages /data/pythonenv/BASELINE - virtualenv -p /usr/bin/python2.6 --no-site-packages ${virtualenv} - - # we do this in two steps, because it seems that we can not upgrade - # distribute when we need to use it to install mysql-python. - ${virtualenv}/bin/pip install --upgrade -r /etc/ietfdb/ietfdb-requirements.txt - ${virtualenv}/bin/pip install --upgrade -r /etc/ietfdb/ietfdb-requirements2.txt -fi - diff --git a/support/ietfdb-base/DEBIAN/postrm b/support/ietfdb-base/DEBIAN/postrm deleted file mode 100755 index 20da46449..000000000 --- a/support/ietfdb-base/DEBIAN/postrm +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ remove = "$1" ]; then - : - -### BEGIN DIVERT GENERATE ### -### END DIVERT GENERATE ### - -fi diff --git a/support/ietfdb-base/DEBIAN/preinst b/support/ietfdb-base/DEBIAN/preinst deleted file mode 100755 index 08a01d67c..000000000 --- a/support/ietfdb-base/DEBIAN/preinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ install = "$1" ]; then - : - -### BEGIN DIVERT GENERATE ### -### END DIVERT GENERATE ### - -fi diff --git a/support/ietfdb-base/Makefile b/support/ietfdb-base/Makefile deleted file mode 100644 index 4355ea28c..000000000 --- a/support/ietfdb-base/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -TOP = .. - -include $(TOP)/deb.mk diff --git a/support/ietfdb-base/diversions b/support/ietfdb-base/diversions deleted file mode 100644 index e69de29bb..000000000 diff --git a/support/ietfdb-base/etc/apache2/conf.d/wsgi.conf-example b/support/ietfdb-base/etc/apache2/conf.d/wsgi.conf-example deleted file mode 100644 index 7d373dca1..000000000 --- a/support/ietfdb-base/etc/apache2/conf.d/wsgi.conf-example +++ /dev/null @@ -1 +0,0 @@ -WSGIPythonHome /data/pythonenv/BASELINE diff --git a/support/ietfdb-base/etc/ietfdb/ietfdb-requirements.txt b/support/ietfdb-base/etc/ietfdb/ietfdb-requirements.txt deleted file mode 100644 index 101d8068e..000000000 --- a/support/ietfdb-base/etc/ietfdb/ietfdb-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -distribute==0.6.28 -wsgiref==0.1.2 - diff --git a/support/ietfdb-base/etc/ietfdb/ietfdb-requirements2.txt b/support/ietfdb-base/etc/ietfdb/ietfdb-requirements2.txt deleted file mode 100644 index 8c208b13e..000000000 --- a/support/ietfdb-base/etc/ietfdb/ietfdb-requirements2.txt +++ /dev/null @@ -1,7 +0,0 @@ -distribute==0.6.28 -South -MySQL-python -pytz -wsgiref==0.1.2 -PyQuery -python-magic diff --git a/support/ietfdb-devel/DEBIAN/control b/support/ietfdb-devel/DEBIAN/control deleted file mode 100644 index 5dc4e2161..000000000 --- a/support/ietfdb-devel/DEBIAN/control +++ /dev/null @@ -1,10 +0,0 @@ -Package: ietf-ietfdb-devel -Version: $(VER) -Section: ietf -Priority: optional -Architecture: all -Provides: ietf-ietfdb-devel -Depends: ietf-ietfdb-base, mysql-server -Maintainer: -Description: Installs prerequites for running IETF DB (Datatracker) locally - as a developer. diff --git a/support/ietfdb-devel/Makefile b/support/ietfdb-devel/Makefile deleted file mode 100644 index 4355ea28c..000000000 --- a/support/ietfdb-devel/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -TOP = .. - -include $(TOP)/deb.mk diff --git a/support/ietfdb-devel/diversions b/support/ietfdb-devel/diversions deleted file mode 100644 index e69de29bb..000000000 diff --git a/support/instdeb.mk b/support/instdeb.mk deleted file mode 100644 index b32c1c3db..000000000 --- a/support/instdeb.mk +++ /dev/null @@ -1,24 +0,0 @@ -include $(TOP)/common.mk - -DIRS ?= $(shell find . -maxdepth 1 -type d | egrep -v '\.$$' | sed 's/\.\///') - -all : deb - -deb : $(DEB) - -$(DEB) : - @rm -rf tmp - @mkdir -p tmp tmp/DEBIAN - @make DESTDIR=`pwd`/tmp install - @perl -p -e 's/\$$\(VER\)/$(VER)/g' tmp/DEBIAN/control - @echo Packaging $(DEB) - @fakeroot sh -c 'chown -R root tmp; dpkg-deb -b tmp $(DEB)' - @rm -rf tmp - -push : $(DEB) - scp $(DEB) $(INCOMING) - -clean:: - @rm -rf *.deb tmp - -.PHONY : all deb push clean diff --git a/support/tools/divert b/support/tools/divert deleted file mode 100644 index b0a50b728..000000000 --- a/support/tools/divert +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/perl -# Autogenerate the list of packages to dpkg-divert for this .deb package - -use File::stat; - -# List of files that are being overriden by this package -if (! -e "diversions") { system("touch diversions"); } -open DIVERSIONS, "; -close DIVERSIONS; - -my $begin_delim = "### BEGIN DIVERT GENERATE ###"; -my $end_delim = "### END DIVERT GENERATE ###"; - -my $preinst_path = "DEBIAN/preinst"; -my $postrm_path = "DEBIAN/postrm"; -my $pkg = shift; - -# Slurp in both existing files (to use as a template) -undef $/; - -if(open( PREINST, "<$preinst_path")) { - $preinst = ; - close PREINST; -} else { - $preinst='#!/bin/sh - -if [ install = "$1" ] || [ upgrade = "$1" ]; then - : -'.$begin_delim."\n".$end_delim."\nfi\n"; -} - -if(open(POSTRM, "<$postrm_path")) { - $postrm = ; - close POSTRM; -} else { - $postrm='#!/bin/sh -if [ remove = "$1" ]; then - : -'.$begin_delim."\n".$end_delim."\nfi\n"; -} - -# Generate preinst stub -my $preinst_stub = ""; -foreach my $entry (@diversions) -{ - chomp($entry); - next if ($entry =~ /^$/); - my @pair = split(",", $entry); - $pair[1] =~ s/\n//; - $preinst_stub .= " dpkg-divert --package $pkg --add --rename --divert $pair[0].$pair[1] $pair[0]\n"; -} -$preinst =~ s/$begin_delim.*$end_delim/$begin_delim\n$preinst_stub$end_delim/s; - -# Write generated portion back to script file -open PREINST, ">$preinst_path"; -print PREINST $preinst; -close PREINST; -chmod 0755, $preinst_path; - -# Generate postrm stub -my $postrm_stub = ""; -foreach my $entry (@diversions) -{ - chomp($entry); - next if ($entry =~ /^$/); - my @pair = split(",", $entry); - $pair[1] =~ s/\n//; - $postrm_stub .= " dpkg-divert --package $pkg --remove --rename --divert $pair[0].$pair[1] $pair[0]\n"; -} -$postrm =~ s/$begin_delim.*$end_delim/$begin_delim\n$postrm_stub$end_delim/s; - -# Write generated portion back to script file -open POSTRM, ">$postrm_path"; -print POSTRM $postrm; -close POSTRM; -chmod 0755, $postrm_path;