Merge branch 'redohp' into 'master'

re-do site in schiedsstelle layout

See merge request KampfCaspar/help.ccc.de!1

1 files changed, 122 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 1522d19..d3a2532 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,124 @@
+PY?=python
+PELICAN?=pelican
+PELICANOPTS=
 
+BASEDIR=$(CURDIR)
+INPUTDIR=$(BASEDIR)/content
+OUTPUTDIR=$(BASEDIR)/output
+CONFFILE=$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$(BASEDIR)/publishconf.py
 
-deploy:
-        ssh julius@knut.vpn.mittenzwei.com mkdir -p help.ccc.de
-        scp index.html julius@knut.vpn.mittenzwei.com:help.ccc.de
-        #ssh julius@content.events.ccc.de mkdir -p help.ccc.de
-        #scp index.html julius@content.events.ccc.de:help.ccc.de
+FTP_HOST=localhost
+FTP_USER=anonymous
+FTP_TARGET_DIR=/
+
+SSH_HOST=localhost
+SSH_PORT=22
+SSH_USER=root
+SSH_TARGET_DIR=/var/www
+
+S3_BUCKET=my_s3_bucket
+
+CLOUDFILES_USERNAME=my_rackspace_username
+CLOUDFILES_API_KEY=my_rackspace_api_key
+CLOUDFILES_CONTAINER=my_cloudfiles_container
+
+DROPBOX_DIR=~/Dropbox/Public/
+
+GITHUB_PAGES_BRANCH=gh-pages
+
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+        PELICANOPTS += -D
+endif
+
+RELATIVE ?= 0
+ifeq ($(RELATIVE), 1)
+        PELICANOPTS += --relative-urls
+endif
+
+help:
+        @echo 'Makefile for a pelican Web site                                           '
+        @echo '                                                                          '
+        @echo 'Usage:                                                                    '
+        @echo '   make html                           (re)generate the web site          '
+        @echo '   make clean                          remove the generated files         '
+        @echo '   make regenerate                     regenerate files upon modification '
+        @echo '   make publish                        generate using production settings '
+        @echo '   make serve [PORT=8000]              serve site at http://localhost:8000'
+        @echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
+        @echo '   make devserver [PORT=8000]          start/restart develop_server.sh    '
+        @echo '   make stopserver                     stop local server                  '
+        @echo '   make ssh_upload                     upload the web site via SSH        '
+        @echo '   make rsync_upload                   upload the web site via rsync+ssh  '
+        @echo '   make dropbox_upload                 upload the web site via Dropbox    '
+        @echo '   make ftp_upload                     upload the web site via FTP        '
+        @echo '   make s3_upload                      upload the web site via S3         '
+        @echo '   make cf_upload                      upload the web site via Cloud Files'
+        @echo '   make github                         upload the web site via gh-pages   '
+        @echo '                                                                          '
+        @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
+        @echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
+        @echo '                                                                          '
+
+html:
+        $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+
+clean:
+        [ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
+
+regenerate:
+        $(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+
+serve:
+ifdef PORT
+        cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
+else
+        cd $(OUTPUTDIR) && $(PY) -m pelican.server
+endif
+
+serve-global:
+ifdef SERVER
+        cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER)
+else
+        cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0
+endif
+
+
+devserver:
+ifdef PORT
+        $(BASEDIR)/develop_server.sh restart $(PORT)
+else
+        $(BASEDIR)/develop_server.sh restart
+endif
+
+stopserver:
+        $(BASEDIR)/develop_server.sh stop
+        @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
+
+publish:
+        $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
+
+ssh_upload: publish
+        scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+
+rsync_upload: publish
+        rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+
+dropbox_upload: publish
+        cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
+
+ftp_upload: publish
+        lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
+
+s3_upload: publish
+        s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
+
+cf_upload: publish
+        cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
+
+github: publish
+        ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
+        git push origin $(GITHUB_PAGES_BRANCH)
+
+.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github