Merge branch 'master' of https://git.vvvvvvaria.org/varia/voicegardens

bin/copy-fixed-archive

@@ -4,7 +4,9 @@ echo "Spitting out todays date and time ..."
 date
 
 echo "Copying over the doesitsparkjoy.voicegardens.org fixed archive ..."
+rm -rf /var/www/doesitsparkjoy.voicegardens.org/voicegardens/archive/*
 cp /var/www/doesitsparkjoy.voicegardens.org/voicegardens/fixed-archive/* /var/www/doesitsparkjoy.voicegardens.org/voicegardens/archive/
 
 echo "Copying over the voicegardens.org fixed archive ..."
+rm -rf /var/www/voicegardens.org/voicegardens/archive/*
 cp /var/www/voicegardens.org/voicegardens/fixed-archive/* /var/www/voicegardens.org/voicegardens/archive/

fabfile.py

@@ -11,8 +11,7 @@ def doesitsparkjoy(c):
         c.run('sudo supervisorctl restart apps:doesitsparkjoy')
         c.run('sudo systemctl restart nginx')
         c.run('sh bin/clear-archives')
-        # TODO: enable when it works again
+        c.run('sh bin/copy-fixed-archive')
-        # c.run('sh bin/copy-fixed-archive')
     print('Released <3')
 
 @task
@@ -24,8 +23,7 @@ def voicegardens(c):
         c.run('sudo supervisorctl restart apps:voicegardens')
         c.run('sudo systemctl restart nginx')
         c.run('sh bin/clear-archives')
-        # TODO: enable when it works again
+        c.run('sh bin/copy-fixed-archive')
-        # c.run('sh bin/copy-fixed-archive')
     print('Released <3')
 
 @task