aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2019-04-20 19:15:26 +0200
committerDavid Runge <dave@sleepmap.de>2019-04-20 19:15:26 +0200
commit049be36622c5c4f77da154d254a9757ae44bb77e (patch)
tree8e047dc41bbb9d5f7a13e2d4ba9b223486404344
parent12536968dbd4dacbdd48b87ae75ae52d9980a8f0 (diff)
downloadsleepmap-049be36622c5c4f77da154d254a9757ae44bb77e.tar.gz
sleepmap-049be36622c5c4f77da154d254a9757ae44bb77e.tar.bz2
sleepmap-049be36622c5c4f77da154d254a9757ae44bb77e.tar.xz
sleepmap-049be36622c5c4f77da154d254a9757ae44bb77e.zip
{Makefile,TODO,developer_server.sh,{fabfile,publishconf,pelicanconf}.py}: Removing files only relevant for pelican.
-rw-r--r--Makefile110
-rw-r--r--TODO6
-rwxr-xr-xdevelop_server.sh103
-rw-r--r--fabfile.py73
-rw-r--r--pelicanconf.py62
-rw-r--r--publishconf.py24
6 files changed, 0 insertions, 378 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d6fc6d0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-PY?=python3
-PELICAN?=pelican
-PELICANOPTS=
-
-BASEDIR=$(CURDIR)
-INPUTDIR=$(BASEDIR)/content
-OUTPUTDIR=$(BASEDIR)/output
-CONFFILE=$(BASEDIR)/pelicanconf.py
-PUBLISHCONF=$(BASEDIR)/publishconf.py
-
-FTP_HOST=localhost
-FTP_USER=anonymous
-FTP_TARGET_DIR=/
-
-SSH_HOST=sleepmap.de
-SSH_PORT=22
-SSH_USER=dave
-SSH_TARGET_DIR=/srv/http/websites/sleepmap.de
-
-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
-
-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 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 ' '
-
-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
-
-devserver:
-ifdef PORT
- $(BASEDIR)/develop_server.sh restart $(PORT)
-else
- $(BASEDIR)/develop_server.sh restart
-endif
-
-stopserver:
- kill -9 `cat pelican.pid`
- kill -9 `cat srv.pid`
- @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 devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
diff --git a/TODO b/TODO
deleted file mode 100644
index b75e5ce..0000000
--- a/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-* convert all markdown pages to reStructuredText
-* add flattr button (https://github.com/Schnouki/pelican-elegant/commit/83189e498730fe68c96defdf4b71a964a076a443)
- http://developers.flattr.net/feed/
- http://developers.flattr.net/button/
-* split music page into links to several project pages
-
diff --git a/develop_server.sh b/develop_server.sh
deleted file mode 100755
index ae8f29e..0000000
--- a/develop_server.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-##
-# This section should match your Makefile
-##
-PY=${PY:-python3}
-PELICAN=${PELICAN:-pelican}
-PELICANOPTS=
-
-BASEDIR=$(pwd)
-INPUTDIR=$BASEDIR/content
-OUTPUTDIR=$BASEDIR/output
-CONFFILE=$BASEDIR/pelicanconf.py
-
-###
-# Don't change stuff below here unless you are sure
-###
-
-SRV_PID=$BASEDIR/srv.pid
-PELICAN_PID=$BASEDIR/pelican.pid
-
-function usage(){
- echo "usage: $0 (stop) (start) (restart) [port]"
- echo "This starts Pelican in debug and reload mode and then launches"
- echo "an HTTP server to help site development. It doesn't read"
- echo "your Pelican settings, so if you edit any paths in your Makefile"
- echo "you will need to edit your settings as well."
- exit 3
-}
-
-function alive() {
- kill -0 $1 >/dev/null 2>&1
-}
-
-function shut_down(){
- PID=$(cat $SRV_PID)
- if [[ $? -eq 0 ]]; then
- if alive $PID; then
- echo "Stopping HTTP server"
- kill $PID
- else
- echo "Stale PID, deleting"
- fi
- rm $SRV_PID
- else
- echo "HTTP server PIDFile not found"
- fi
-
- PID=$(cat $PELICAN_PID)
- if [[ $? -eq 0 ]]; then
- if alive $PID; then
- echo "Killing Pelican"
- kill $PID
- else
- echo "Stale PID, deleting"
- fi
- rm $PELICAN_PID
- else
- echo "Pelican PIDFile not found"
- fi
-}
-
-function start_up(){
- local port=$1
- echo "Starting up Pelican and HTTP server"
- shift
- $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
- pelican_pid=$!
- echo $pelican_pid > $PELICAN_PID
- cd $OUTPUTDIR
- $PY -m pelican.server $port &
- srv_pid=$!
- echo $srv_pid > $SRV_PID
- cd $BASEDIR
- sleep 1
- if ! alive $pelican_pid ; then
- echo "Pelican didn't start. Is the Pelican package installed?"
- return 1
- elif ! alive $srv_pid ; then
- echo "The HTTP server didn't start. Is there another service using port" $port "?"
- return 1
- fi
- echo 'Pelican and HTTP server processes now running in background.'
-}
-
-###
-# MAIN
-###
-[[ ($# -eq 0) || ($# -gt 2) ]] && usage
-port=''
-[[ $# -eq 2 ]] && port=$2
-
-if [[ $1 == "stop" ]]; then
- shut_down
-elif [[ $1 == "restart" ]]; then
- shut_down
- start_up $port
-elif [[ $1 == "start" ]]; then
- if ! start_up $port; then
- shut_down
- fi
-else
- usage
-fi
diff --git a/fabfile.py b/fabfile.py
deleted file mode 100644
index 2384640..0000000
--- a/fabfile.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from fabric.api import *
-import fabric.contrib.project as project
-import os
-import sys
-import SimpleHTTPServer
-import SocketServer
-
-# Local path configuration (can be absolute or relative to fabfile)
-env.deploy_path = 'output'
-DEPLOY_PATH = env.deploy_path
-
-# Remote server configuration
-production = 'data@sleepmap.de:22'
-dest_path = '/home/data/sleepmap.de'
-
-# Rackspace Cloud Files configuration settings
-env.cloudfiles_username = 'my_rackspace_username'
-env.cloudfiles_api_key = 'my_rackspace_api_key'
-env.cloudfiles_container = 'my_cloudfiles_container'
-
-
-def clean():
- if os.path.isdir(DEPLOY_PATH):
- local('rm -rf {deploy_path}'.format(**env))
- local('mkdir {deploy_path}'.format(**env))
-
-def build():
- local('pelican -s pelicanconf.py')
-
-def rebuild():
- clean()
- build()
-
-def regenerate():
- local('pelican -r -s pelicanconf.py')
-
-def serve():
- os.chdir(env.deploy_path)
-
- PORT = 8000
- class AddressReuseTCPServer(SocketServer.TCPServer):
- allow_reuse_address = True
-
- server = AddressReuseTCPServer(('', PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
-
- sys.stderr.write('Serving on port {0} ...\n'.format(PORT))
- server.serve_forever()
-
-def reserve():
- build()
- serve()
-
-def preview():
- local('pelican -s publishconf.py')
-
-def cf_upload():
- rebuild()
- local('cd {deploy_path} && '
- 'swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
- '-U {cloudfiles_username} '
- '-K {cloudfiles_api_key} '
- 'upload -c {cloudfiles_container} .'.format(**env))
-
-@hosts(production)
-def publish():
- local('pelican -s publishconf.py')
- project.rsync_project(
- remote_dir=dest_path,
- exclude=".DS_Store",
- local_dir=DEPLOY_PATH.rstrip('/') + '/',
- delete=True,
- extra_opts='-c',
- )
diff --git a/pelicanconf.py b/pelicanconf.py
deleted file mode 100644
index a86633c..0000000
--- a/pelicanconf.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
-
-ARTICLE_PATHS = ['blog']
-ARTICLE_SAVE_AS = '{date:%Y}/{slug}/index.html'
-ARTICLE_URL = '{date:%Y}/{slug}/'
-AUTHOR = 'David Runge'
-AUTHOR_FEED_ATOM = None
-AUTHOR_FEED_RSS = None
-CATEGORY_FEED_ATOM = None
-DEFAULT_LANG = 'en'
-DEFAULT_PAGINATION = 30
-FEED_ALL_ATOM = None
-LINKS = (
- ('000', 'http://0x0x0.porn'),
- ('Arch Linux', 'https://archlinux.org'),
- ('Befaco', 'https://befaco.org'),
- ('c-base', 'https://c-base.org/'),
- ('Chaos Computer Club', 'https://ccc.de/'),
- ('Electronic Studio (TU)', 'https://www.ak.tu-berlin.de/studio'),
- ('Linux Audio', 'http://linuxaudio.org'),
- ('miniLAC', 'http://minilac.linuxaudio.org'),
- ('Modular Synth Selbstbau Workshop', 'http://mssw.0x0x0.porn'),
- ('NetworkSEC', 'https://networksec.de'),
- ('Rebel Technology', 'http://rebeltech.org'),
- ('Waldeck-Freakquenz', 'http://waldeck-freakquenz.de'),
-)
-LOAD_CONTENT_CACHE = False
-MENUITEMS = ()
-PATH = 'content'
-PATH_METADATA = 'pages/(?P<path>.*)\..*' # Make pages top-level (remove /pages/ from each URL)
-# Plugins
-PLUGIN_PATHS = ['pelican-plugins/']
-PLUGINS = [ 'pelican-page-hierarchy']
-# Uncomment following line if you want document-relative URLs when developing
-RELATIVE_URLS = True
-SITENAME = 'Sleep Map'
-SITESUBTITLE = "Live - Create - Sleep (a map through existence)"
-SITEURL = 'https://sleepmap.de'
-# Social widget
-SOCIAL = (
- ('Discogs', 'https://www.discogs.com/user/dvzrv'),
- ('Flattr', 'https://flattr.com/profile/davezerave'),
- ('Github', 'https://github.com/dvzrv'),
- ('Twitter', 'https://twitter.com/dvzrv'),
-)
-STATIC_PATHS = [
- 'audio',
- 'icons',
- 'images',
- 'cert',
- 'static/robots.txt',
-]
-EXTRA_PATH_METADATA = {
- 'static/robots.txt': {'path': 'robots.txt'},
-}
-
-THEME = 'sleepmap-theme'
-TIMEZONE = 'Europe/Berlin'
-TRANSLATION_FEED_ATOM = None
-USE_FOLDER_AS_CATEGORY = False
diff --git a/publishconf.py b/publishconf.py
deleted file mode 100644
index 303b55f..0000000
--- a/publishconf.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
-
-# This file is only used if you use `make publish` or
-# explicitly specify it as your config file.
-
-import os
-import sys
-sys.path.append(os.curdir)
-from pelicanconf import *
-
-SITEURL = 'https://sleepmap.de'
-RELATIVE_URLS = False
-
-FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
-
-DELETE_OUTPUT_DIRECTORY = True
-
-# Following items are often useful when publishing
-
-#DISQUS_SITENAME = ""
-#GOOGLE_ANALYTICS = ""