Merge branch 'master' of ssh://vvvvvvaria.org:12345/varia/homebrewserver.club

README.md

@@ -69,4 +69,15 @@ us to work on new articles and still store the pages here in the repository.
 
 ## Deploying the site
 
-TODO.
+We have a Git hook setup, so just push as you would as normal:
+
+```
+$ git push origin master
+```
+
+Details for maintaining the hook on the Varia server are:
+
+* We have cloned the site in `/srv/gitea/clones/homebrewserver.club`
+* We have create a hook deployment script in `/srv/gitea/gitea-repositories/varia/homebrewserver.club.git/hooks/post-update`
+
+How it works: when someone runs a `git push origin master`, the script in the `post-update` will run after the updating is finished. In this script, we run all the steps to publish the site as per usual. Such as running `pip install -r requirements.txt` and `pelican` to generate the new output.

requirements.txt

@@ -1,4 +1,3 @@
 Markdown==3.1.1
 beautifulsoup4==4.7.1
-invoke==1.2.0
 pelican==4.0.1

tasks.py

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import shutil
-import sys
-
-from invoke import task
-from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
-
-CONFIG = {
-    'content_path': 'content',
-    'deploy_path': 'output',
-    'dest_path': '/var/www/homebrewserver.club',
-    'port': 8000,
-}
-
-
-@task
-def clean(c):
-    """Remove generated files"""
-    if os.path.isdir(CONFIG['deploy_path']):
-        shutil.rmtree(CONFIG['deploy_path'])
-        os.makedirs(CONFIG['deploy_path'])
-
-
-@task
-def build(c):
-    """Build local version of site"""
-    c.run('pelican -s pelicanconf.py')
-
-
-@task
-def rebuild(c):
-    """`build` with the delete switch"""
-    c.run('pelican -d -s pelicanconf.py')
-
-
-@task
-def regenerate(c):
-    """Automatically regenerate site upon file modification"""
-    c.run('pelican -r -s pelicanconf.py')
-
-
-@task
-def serve(c):
-    """Serve site at http://localhost:8000/"""
-
-    class AddressReuseTCPServer(RootedHTTPServer):
-        allow_reuse_address = True
-
-    server = AddressReuseTCPServer(
-        CONFIG['deploy_path'], ('', CONFIG['port']), ComplexHTTPRequestHandler
-    )
-
-    sys.stderr.write('Serving on port {port} ...\n'.format(**CONFIG))
-    server.serve_forever()
-
-
-@task
-def reserve(c):
-    """`build`, then `serve`"""
-    build(c)
-    serve(c)
-
-
-@task
-def preview(c):
-    """Build production version of site"""
-    c.run('pelican -s publishconf.py')
-
-
-@task
-def publish(c):
-    """Publish to production via Git hook"""
-    # TODO: use generation and rsync here for publishing
-    #       also update README.md "Deploying the site" instructions
-    c.run('git push origin master')