Determine whether to use package via 'use_package' in vhost config.

With it being overridable by 'USE_PACKAGE' envvar.

Author: neprune

bin/deploy-vhost

@@ -46,12 +46,10 @@ die "Specify virtual host name as first parameter, deploy/stop/update/start/remo
 
 my $flush;
 my $force;
-my $from_package;
 my $thread_id = '';
 GetOptions(
     flush => \$flush,
     force => \$force,
-    'from-package' => \$from_package,
     'thread:s' => \$thread_id,
 );
 
@@ -60,13 +58,7 @@ my $vhost = shift @ARGV;
 my $action = shift @ARGV;
 die "Specify 'deploy', 'stop', 'update', 'start', 'servers', 'balancers' or 'remove' as second parameter" if $action ne "deploy" && $action ne "stop" && $action ne "update" && $action ne "start" && $action ne 'remove' && $action ne 'servers' && $action ne 'balancers';
 
-my $vhost_package;
-if ($from_package) {
-    $vhost_package = $ENV{VHOST_PACKAGE};
-    if (!$vhost_package) {
-        die "--from-package was given but VHOST_PACKAGE was not set";
-    }
-}
+my $vhost_package = $ENV{VHOST_PACKAGE};
 
 my $hostname = `hostname`;
 chomp($hostname);
@@ -453,7 +445,7 @@ sub create_or_update_files {
     make_symlink($web_dir, "$vhost_dir/docs");
     shell("chown", "-h", "$conf->{user_uid}:$conf->{user_gid}", "$vhost_dir/docs"); # perl's chown doesn't do symlinks
 
-    if ($from_package) {
+    if ($vhost_package) {
         print "Will deploy from package $vhost_package.\n";
         print "Fetching $vhost_package..\n.";
         shell(

bin/mysociety

@@ -24,12 +24,11 @@ COMMAND is one of:
     config
         Tell Puppet to pull new manifests and apply them
 
-    vhost [--server server | --all] VHOST [--force] [--flush] [--from-package]
+    vhost [--server server | --all] VHOST [--force] [--flush]
 	    Deploy latest version of VHOST, e.g. www.pledgebank.com,
         optionally on [server] or, with --all, on all VHOST's servers
         --force will override any local uncommitted changes
         --flush will ban VHOST and its aliases from local Varnish
-        --from-package will build a vhost package if needed, and use it for the deploy
 
     vhost stop/update/start [--server server | --all] VHOST
         Stop/update/start VHOST, e.g. www.pledgebank.com
@@ -131,7 +130,10 @@ case $COMMAND in
             VHOST=$1
             shift || die "specify a virtual host"
         fi
-        if [[ "$COMMAND" == "package" || $* == *"--from-package"* ]]
+
+        USE_PACKAGE_FROM_CONFIG=$(jq .vhosts.\"${VHOST}\".use_package /data/vhosts.json 2>/dev/null)
+        USE_PACKAGE=${USE_PACKAGE-$USE_PACKAGE_FROM_CONFIG}
+        if [[ "$COMMAND" == "package" || "$USE_PACKAGE" == "1" || "$USE_PACKAGE" == "true" ]]
         then
             if [ -z "$VHOST_PACKAGE" ]
             then
@@ -191,7 +193,7 @@ case $COMMAND in
                     sleep 5
                 fi
                 echo -e "\033[34m[deploy] Performing ${COMMAND:-deploy} for ${VHOST} on ${s}...\033[0m"
-                ssh -t "$s" sudo ${VHOST_PACKAGE:+env VHOST_PACKAGE="$VHOST_PACKAGE"}  mysociety vhost "$COMMAND" "$VHOST" "$@" --thread $THREAD_ID
+                ssh -t "$s" sudo ${VHOST_PACKAGE:+env VHOST_PACKAGE="$VHOST_PACKAGE"} mysociety vhost "$COMMAND" "$VHOST" "$@" --thread $THREAD_ID
                 if [ "$COMMAND" != "stop" ] && [ "$COMMAND" != "remove" ]; then
                     if [ -n "$BALANCERS" ] && [ "$DO_VARNISH" == "yes" ]; then
                         # This should provide a bit of time for process manager to start, or at least have the