backups, us.pycon.org integration done

Author: njl

TODO.md

@@ -22,9 +22,10 @@
 - [x] Clean up the menu bar in batch
 - [x] batch hide your groups from yourself
 - [x] Turn emailing back on
-- [ ] Backups
-- [ ] Integrate with us.pycon.org
+- [x] Backups
+- [x] Integrate with us.pycon.org
 - [ ] Email reminders/updates to committee members
+- [ ] Handle withdrawn talks
 - [ ] ~~Analysis export~~ (Just SQL query it)
 - [ ] ~~Remove random chat from talks~~ (Leave chat on talks)
 - [ ] ~~batch group tweaking UI~~ (Do it before import)

deployment/backup-cron

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sudo -u postgres /usr/bin/pg_dump progcom > /opt/progcom-backup/progcom-db-`date -Ihours`
+
+/opt/tarsnap/bin/tarsnap -c --keyfile /root/tarsnap.key --cachedir /opt/progcom-backup-cache -f progcom-db-`date +%Y-%m-%d_%H-%M-%S` /opt/progcom-backup && curl https://nosnch.in/0540fdd2ae &> /dev/null

deployment/prod.yaml

@@ -19,6 +19,7 @@
             - libpq-dev
             - libffi-dev
             - python-psycopg2
+            - e2fslibs-dev
 
 
     #Basic service
@@ -58,6 +59,11 @@
       - postgresql_user: name=progcom password=progcom role_attr_flags=NOSUPERUSER
         sudo_user: postgres
 
+    #Backup (Installed tarsnap by hand with `./configure #--prefix=/opt/tarsnap`)
+      - file: path=/opt/progcom-backup state=directory
+      - file: path=/opt/progcom-backup-cache state=directory
+      - template: src=backup-cron dest=/etc/cron.daily/progcom-backups
+                    mode=0744
 
   handlers:
       - name: restart nginx

pull_updates.py

@@ -43,11 +43,8 @@ def fetch_talk(id):
     rv = api_call('/2016/pycon_api/proposals/{}/'.format(id))['data']
     rv['authors'] = rv['speakers']
     del rv['speakers']
-    print rv['authors']
     rv.update(rv['details'])
     del rv['details']
-    rv['category'] = 'PLACEHOLDER'#TODO
-    rv['additional_requirements'] = 'PLACEHOLDER'#TODO
     return rv
 
 def main():