[dak/master] Make variable name a little more to type, damn Luke, and allow cronscript to run deploy

[Joerg Jaspert <joerg@debian.org>]

---
 config/debian/deploy.functions | 6 +++---
 config/debian/vars             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/debian/deploy.functions b/config/debian/deploy.functions
index 34c8d1a9..3bc2ec75 100644
--- a/config/debian/deploy.functions
+++ b/config/debian/deploy.functions
@@ -32,9 +32,9 @@ function check_for_db_update() {
         declare -r NEWDBVER=${NEWDBVER%%.py}
     fi
 
-    if [[ ${OLDDBVER} -ne ${NEWDBVER} ]] && [[ -z ${DODB:-""} ]]; then
-        # Differing versions and no DODB variable, break
-        log_error "Database update from ${OLDDBVER} to ${NEWDBVER} required, will not update dak code on ${HOSTNAME} unless told with DODB=1 in the environment"
+    if [[ ${OLDDBVER} -ne ${NEWDBVER} ]] && [[ -z ${FORCETHISDAMNUPGRADEIKNOWWHATIDOIHOPE:-""} ]]; then
+        # Differing versions and no FORCETHISDAMNUPGRADEIKNOWWHATIDOIHOPE variable, break
+        log_error "Database update from ${OLDDBVER} to ${NEWDBVER} required, will not update dak code on ${HOSTNAME} unless told with FORCETHISDAMNUPGRADEIKNOWWHATIDOIHOPE=1 in the environment"
         exit 21
     fi
 }
diff --git a/config/debian/vars b/config/debian/vars
index 5a0866f5..1d3e4643 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -49,7 +49,7 @@ LOCK_STOP="${lockdir}/archive.stop"
 TIMESTAMP=false
 
 # And the following types of cronscripts exists
-declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror)'
+declare -lr POSSIBLEARGS='+(unchecked|dinstall|hourly|daily|weekly|monthly|yearly|mirror|deploy)'
 declare -r HOSTNAME=$(hostname -s)
 
 archs=$(dak admin a list | tr '\n' ' ')
-- 
2.11.0