From d0492beacc9bae45c9ac73072c6c97621f0b1b5a Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 28 Sep 2017 15:20:04 +0200 Subject: hyiene --- Makefile | 108 -------------------------------- content/posts/podcasting-with-pulse.rst | 2 +- develop_server.sh | 103 ------------------------------ upload.sh | 18 ++++++ 4 files changed, 19 insertions(+), 212 deletions(-) delete mode 100644 Makefile delete mode 100755 develop_server.sh create mode 100755 upload.sh diff --git a/Makefile b/Makefile deleted file mode 100644 index c0643cb..0000000 --- a/Makefile +++ /dev/null @@ -1,108 +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=syntax-fehler.de -FTP_USER=syntax-fehler -FTP_TARGET_DIR=httpdocs - -SSH_HOST=euer.krebsco.de -SSH_PORT=22 -SSH_USER=root -SSH_TARGET_DIR=/var/www/blog.euer - -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/ - -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: clean - $(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 - rsync -a $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) - -rsync_upload: publish - rsync -e "ssh -p $(SSH_PORT)" -P -rvz --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 - -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 $(OUTPUTDIR) - git push origin gh-pages - -.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github diff --git a/content/posts/podcasting-with-pulse.rst b/content/posts/podcasting-with-pulse.rst index a3762cc..bf02664 100644 --- a/content/posts/podcasting-with-pulse.rst +++ b/content/posts/podcasting-with-pulse.rst @@ -9,7 +9,7 @@ I want a very simple setup where i can podcast via **studio-link** with my heads Therefore i have: * Headset Mic ( alsa_output.CODEC.analog-stereo.monitor ) -* Headset Speaker ( alsa_input.CODEC.analog-stereo.monitor ) +* Headset Speaker ( alsa_input.CODEC.analog-stereo ) * studio-link recording * studio-link playback diff --git a/develop_server.sh b/develop_server.sh deleted file mode 100755 index 56c9cb9..0000000 --- a/develop_server.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env bash -## -# This section should match your Makefile -## -PY=python3 -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 "A pelican.server to help site development. It doesn't read" - echo "your pelican options so you edit any paths in your Makefile" - echo "you will need to edit it 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 "Killing pelican.server" - kill $PID - else - echo "Stale PID, deleting" - fi - rm $SRV_PID - else - echo "pelican.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 pelican.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 "pelican.server didn't start. Is there something else which uses port 8000?" - return 1 - fi - echo 'Pelican and pelican.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/upload.sh b/upload.sh new file mode 100755 index 0000000..a64e060 --- /dev/null +++ b/upload.sh @@ -0,0 +1,18 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p python3Packages.pelican -i bash + +set -xeuf + +SSH_HOST=euer.krebsco.de +SSH_PORT=22 +SSH_USER=root +SSH_TARGET_DIR=/var/www/blog.euer + +BASEDIR=$(dirname $(readlink -f $0)) +INPUTDIR=$BASEDIR/content +OUTPUTDIR=$BASEDIR/output +CONFFILE=$BASEDIR/pelicanconf.py +PUBLISHCONF=$BASEDIR/publishconf.py + +pelican $INPUTDIR -o $OUTPUTDIR -s $CONFFILE +rsync -a $OUTPUTDIR/. $SSH_USER@$SSH_HOST:$SSH_TARGET_DIR -- cgit v1.2.3