From dcfa206d19f8e7161aa3f2555520fe96ec3ac50b Mon Sep 17 00:00:00 2001 From: "duncan.parkes" Date: Mon, 17 Sep 2007 16:53:00 +0000 Subject: [PATCH] fix some deployment script bugs --- cgi-bin/Doncaster.cgi | 2 +- deployment_script.svn | 4 +++- deployment_script_common | 15 +++++---------- python_scrapers/SitesToGenerate.csv | 1 - 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/cgi-bin/Doncaster.cgi b/cgi-bin/Doncaster.cgi index b0a0012..d66c155 100644 --- a/cgi-bin/Doncaster.cgi +++ b/cgi-bin/Doncaster.cgi @@ -16,7 +16,7 @@ year = form.getfirst('year') authority_name = "Doncaster Metropolitan Borough Council" authority_short_name = "Doncaster" -base_url = "http://maps.doncaster.gov.uk/publicaccess/tdc/" +base_url = "http://local.doncaster.gov.uk/PublicAccess/tdc/" #print "Content-Type: text/html" # HTML is following #print diff --git a/deployment_script.svn b/deployment_script.svn index 893acb9..8263089 100644 --- a/deployment_script.svn +++ b/deployment_script.svn @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash export PLANNING_ROOT="/data/vhost/www.planningalerts.com/" export PLANNING_BACKUPS="$PLANNING_ROOT/backups/" @@ -7,4 +7,6 @@ export DEPLOYMENT_LOG="$DEPLOYMENT_LOG_DIRECTORY/deployment_log" export BACKUP_DIRECTORY_NAME="planningalerts_backup_`date +%F_%Hh%Mm%Ss`" +export BACKUP_DIRECTORY="$PLANNING_BACKUPS$BACKUP_DIRECTORY_NAME/" + $SHELL deployment_script_common diff --git a/deployment_script_common b/deployment_script_common index a5c8055..abe890d 100644 --- a/deployment_script_common +++ b/deployment_script_common @@ -1,15 +1,5 @@ #!/bin/bash -PLANNING_ROOT="/data/vhost/www.planningalerts.com/" -PLANNING_BACKUPS="$PLANNING_ROOT/backups/" -DEPLOYMENT_LOG_DIRECTORY="$PLANNING_ROOT/logs/" -DEPLOYMENT_LOG="$DEPLOYMENT_LOG_DIRECTORY/deployment_log" - -BACKUP_DIRECTORY_NAME="planningalerts_backup_`date +%F_%Hh%Mm%Ss`" - -# This will be the name of the new backup directory -BACKUP_DIRECTORY=$PLANNING_BACKUPS$BACKUP_DIRECTORY_NAME - # Check to see if the PLANNING_ROOT directory exists and is writable if ! [ -w $PLANNING_ROOT ]; then @@ -47,6 +37,11 @@ cp -R data $BACKUP_DIRECTORY; echo "Done" echo +echo "Generating python scrapers" +# Generate the python cgi files +(cd python_scrapers; ./generateCGIScripts.py) +echo "Done generating python scrapers" + # Copy the new versions of docs, cgi-bin and tools to PLANNING_ROOT echo "Deploying the new versions of docs, cgi-bin, and tools" cp -R docs cgi-bin tools $PLANNING_ROOT diff --git a/python_scrapers/SitesToGenerate.csv b/python_scrapers/SitesToGenerate.csv index 59250d3..654eca8 100644 --- a/python_scrapers/SitesToGenerate.csv +++ b/python_scrapers/SitesToGenerate.csv @@ -79,7 +79,6 @@ "Teignbridge District Council", "Teignbridge", "http://213.152.63.161/publicaccess/tdc/", "PublicAccess", "PublicAccessParser" "West Berkshire Council", "West Berkshire", "http://ww2.westberks.gov.uk/publicaccess/tdc/", "PublicAccess", "PublicAccessParser" "Bolsover District Council", "Bolsover", "http://217.158.161.181/publicaccess/tdc/", "PublicAccess", "PublicAccessParser" -"Doncaster Metropolitan Borough Council", "Doncaster", "http://maps.doncaster.gov.uk/publicaccess/tdc/", "PublicAccess", "PublicAccessParser" "Dundee City Council", "Dundee", "http://bwarrant.dundeecity.gov.uk/publicaccess/tdc/", "PublicAccess", "PublicAccessParser" "Durham City Council", "Durham", "http://publicaccess.durhamcity.gov.uk/publicaccess/dc/", "PublicAccess", "PublicAccessParser" "East Dorset District Council", "East Dorset", "http://193.243.228.16/PublicAccess/tdc/", "PublicAccess", "PublicAccessParser"