From e354274c7eff48cdf83c801c41886a371ca727e3 Mon Sep 17 00:00:00 2001 From: Michael Kapelko Date: Thu, 6 Jul 2017 21:54:19 +0700 Subject: [PATCH] Conform to Github Pages requirements for organization --- .gitignore | 2 +- ...ring.png => 2017-06-08-ios-refactoring.png | Bin Makefile | 124 ------------------ docs/archives.html => archives.html | 19 +-- .../opensource-game-studio.html | 19 +-- .../opensource-game-studio2.html | 19 +-- docs/authors.html => authors.html | 0 docs/categories.html => categories.html | 19 +-- {docs/category => category}/news.html | 19 +-- {docs/category => category}/review.html | 19 +-- {docs/category => category}/review2.html | 19 +-- develop_server.sh | 103 --------------- fabfile.py | 92 ------------- {docs/feeds => feeds}/all.atom.xml | 0 {docs/feeds => feeds}/news.atom.xml | 0 {docs/feeds => feeds}/review.atom.xml | 0 docs/index.html => index.html | 19 +-- docs/index2.html => index2.html | 19 +-- ...s-tutorial-ru.html => ios-tutorial-ru.html | 19 +-- docs/ios-tutorial.html => ios-tutorial.html | 19 +-- ...-review-ru.html => keyboard-review-ru.html | 19 +-- ...yboard-review.html => keyboard-review.html | 19 +-- docs/kr1-ru.html => kr1-ru.html | 19 +-- docs/kr1.html => kr1.html | 19 +-- docs/kr10-ru.html => kr10-ru.html | 19 +-- docs/kr10.html => kr10.html | 19 +-- docs/kr2-ru.html => kr2-ru.html | 19 +-- docs/kr2.html => kr2.html | 19 +-- docs/kr3-ru.html => kr3-ru.html | 19 +-- docs/kr3.html => kr3.html | 19 +-- docs/kr4-ru.html => kr4-ru.html | 19 +-- docs/kr4.html => kr4.html | 19 +-- docs/kr5-ru.html => kr5-ru.html | 19 +-- docs/kr5.html => kr5.html | 19 +-- docs/kr6-ru.html => kr6-ru.html | 19 +-- docs/kr6.html => kr6.html | 19 +-- docs/kr7-ru.html => kr7-ru.html | 19 +-- docs/kr7.html => kr7.html | 19 +-- docs/kr8-ru.html => kr8-ru.html | 19 +-- docs/kr8.html => kr8.html | 19 +-- docs/kr9-ru.html => kr9-ru.html | 19 +-- docs/kr9.html => kr9.html | 19 +-- {docs/pages => pages}/about-ru.html | 19 +-- {docs/pages => pages}/about.html | 19 +-- {docs/pages => pages}/projects-ru.html | 19 +-- {docs/pages => pages}/projects.html | 19 +-- ...n-review-ru.html => pelican-review-ru.html | 19 +-- ...pelican-review.html => pelican-review.html | 19 +-- .../articles/2017-06-08-ios-refactoring-ru.md | 0 .../articles/2017-06-08-ios-refactoring.md | 0 .../content}/articles/keyboard-review-ru.md | 0 .../content}/articles/keyboard-review.md | 0 .../content}/articles/kr1-ru.md | 0 {content => pelican/content}/articles/kr1.md | 0 .../content}/articles/kr10-ru.md | 0 {content => pelican/content}/articles/kr10.md | 0 .../content}/articles/kr2-ru.md | 0 {content => pelican/content}/articles/kr2.md | 0 .../content}/articles/kr3-ru.md | 0 {content => pelican/content}/articles/kr3.md | 0 .../content}/articles/kr4-ru.md | 0 {content => pelican/content}/articles/kr4.md | 0 .../content}/articles/kr5-ru.md | 0 {content => pelican/content}/articles/kr5.md | 0 .../content}/articles/kr6-ru.md | 0 {content => pelican/content}/articles/kr6.md | 0 .../content}/articles/kr7-ru.md | 0 {content => pelican/content}/articles/kr7.md | 0 .../content}/articles/kr8-ru.md | 0 {content => pelican/content}/articles/kr8.md | 0 .../content}/articles/kr9-ru.md | 0 {content => pelican/content}/articles/kr9.md | 0 .../content}/articles/pelican-review-ru.md | 0 .../content}/articles/pelican-review.md | 0 .../images}/2017-06-08-ios-refactoring.png | Bin .../content}/pages/About-ru.md | 0 {content => pelican/content}/pages/About.md | 0 .../content}/pages/Projects-ru.md | 0 .../content}/pages/Projects.md | 0 pelicanconf.py => pelican/pelicanconf.py | 0 publishconf.py => pelican/publishconf.py | 2 +- docs/tags.html => tags.html | 19 +-- {docs/theme => theme}/css/foundation.min.css | 0 {docs/theme => theme}/css/normalize.css | 0 {docs/theme => theme}/css/pygments.css | 0 {docs/theme => theme}/css/style.css | 0 .../images/icons/delicious.png | Bin .../theme => theme}/images/icons/facebook.png | Bin {docs/theme => theme}/images/icons/github.png | Bin .../images/icons/gitorious.png | Bin {docs/theme => theme}/images/icons/gittip.png | Bin .../images/icons/google-plus.png | Bin {docs/theme => theme}/images/icons/lastfm.png | Bin .../theme => theme}/images/icons/linkedin.png | Bin {docs/theme => theme}/images/icons/rss.png | Bin .../theme => theme}/images/icons/twitter.png | Bin {docs/theme => theme}/js/custom.modernizr.js | 0 {docs/theme => theme}/js/foundation.min.js | 0 {docs/theme => theme}/js/jquery.js | 0 {docs/theme => theme}/js/zepto.js | 0 100 files changed, 282 insertions(+), 801 deletions(-) rename content/images/2017-06-08-ios-refactoring.png => 2017-06-08-ios-refactoring.png (100%) delete mode 100644 Makefile rename docs/archives.html => archives.html (84%) rename {docs/author => author}/opensource-game-studio.html (94%) rename {docs/author => author}/opensource-game-studio2.html (86%) rename docs/authors.html => authors.html (100%) rename docs/categories.html => categories.html (77%) rename {docs/category => category}/news.html (89%) rename {docs/category => category}/review.html (92%) rename {docs/category => category}/review2.html (84%) delete mode 100755 develop_server.sh delete mode 100644 fabfile.py rename {docs/feeds => feeds}/all.atom.xml (100%) rename {docs/feeds => feeds}/news.atom.xml (100%) rename {docs/feeds => feeds}/review.atom.xml (100%) rename docs/index.html => index.html (94%) rename docs/index2.html => index2.html (86%) rename docs/ios-tutorial-ru.html => ios-tutorial-ru.html (92%) rename docs/ios-tutorial.html => ios-tutorial.html (89%) rename docs/keyboard-review-ru.html => keyboard-review-ru.html (80%) rename docs/keyboard-review.html => keyboard-review.html (80%) rename docs/kr1-ru.html => kr1-ru.html (79%) rename docs/kr1.html => kr1.html (79%) rename docs/kr10-ru.html => kr10-ru.html (79%) rename docs/kr10.html => kr10.html (79%) rename docs/kr2-ru.html => kr2-ru.html (79%) rename docs/kr2.html => kr2.html (79%) rename docs/kr3-ru.html => kr3-ru.html (79%) rename docs/kr3.html => kr3.html (79%) rename docs/kr4-ru.html => kr4-ru.html (79%) rename docs/kr4.html => kr4.html (79%) rename docs/kr5-ru.html => kr5-ru.html (79%) rename docs/kr5.html => kr5.html (79%) rename docs/kr6-ru.html => kr6-ru.html (79%) rename docs/kr6.html => kr6.html (79%) rename docs/kr7-ru.html => kr7-ru.html (79%) rename docs/kr7.html => kr7.html (79%) rename docs/kr8-ru.html => kr8-ru.html (79%) rename docs/kr8.html => kr8.html (79%) rename docs/kr9-ru.html => kr9-ru.html (79%) rename docs/kr9.html => kr9.html (79%) rename {docs/pages => pages}/about-ru.html (78%) rename {docs/pages => pages}/about.html (78%) rename {docs/pages => pages}/projects-ru.html (78%) rename {docs/pages => pages}/projects.html (78%) rename docs/pelican-review-ru.html => pelican-review-ru.html (81%) rename docs/pelican-review.html => pelican-review.html (81%) rename {content => pelican/content}/articles/2017-06-08-ios-refactoring-ru.md (100%) rename {content => pelican/content}/articles/2017-06-08-ios-refactoring.md (100%) rename {content => pelican/content}/articles/keyboard-review-ru.md (100%) rename {content => pelican/content}/articles/keyboard-review.md (100%) rename {content => pelican/content}/articles/kr1-ru.md (100%) rename {content => pelican/content}/articles/kr1.md (100%) rename {content => pelican/content}/articles/kr10-ru.md (100%) rename {content => pelican/content}/articles/kr10.md (100%) rename {content => pelican/content}/articles/kr2-ru.md (100%) rename {content => pelican/content}/articles/kr2.md (100%) rename {content => pelican/content}/articles/kr3-ru.md (100%) rename {content => pelican/content}/articles/kr3.md (100%) rename {content => pelican/content}/articles/kr4-ru.md (100%) rename {content => pelican/content}/articles/kr4.md (100%) rename {content => pelican/content}/articles/kr5-ru.md (100%) rename {content => pelican/content}/articles/kr5.md (100%) rename {content => pelican/content}/articles/kr6-ru.md (100%) rename {content => pelican/content}/articles/kr6.md (100%) rename {content => pelican/content}/articles/kr7-ru.md (100%) rename {content => pelican/content}/articles/kr7.md (100%) rename {content => pelican/content}/articles/kr8-ru.md (100%) rename {content => pelican/content}/articles/kr8.md (100%) rename {content => pelican/content}/articles/kr9-ru.md (100%) rename {content => pelican/content}/articles/kr9.md (100%) rename {content => pelican/content}/articles/pelican-review-ru.md (100%) rename {content => pelican/content}/articles/pelican-review.md (100%) rename {docs => pelican/content/images}/2017-06-08-ios-refactoring.png (100%) rename {content => pelican/content}/pages/About-ru.md (100%) rename {content => pelican/content}/pages/About.md (100%) rename {content => pelican/content}/pages/Projects-ru.md (100%) rename {content => pelican/content}/pages/Projects.md (100%) rename pelicanconf.py => pelican/pelicanconf.py (100%) rename publishconf.py => pelican/publishconf.py (96%) rename docs/tags.html => tags.html (76%) rename {docs/theme => theme}/css/foundation.min.css (100%) rename {docs/theme => theme}/css/normalize.css (100%) rename {docs/theme => theme}/css/pygments.css (100%) rename {docs/theme => theme}/css/style.css (100%) rename {docs/theme => theme}/images/icons/delicious.png (100%) rename {docs/theme => theme}/images/icons/facebook.png (100%) rename {docs/theme => theme}/images/icons/github.png (100%) rename {docs/theme => theme}/images/icons/gitorious.png (100%) rename {docs/theme => theme}/images/icons/gittip.png (100%) rename {docs/theme => theme}/images/icons/google-plus.png (100%) rename {docs/theme => theme}/images/icons/lastfm.png (100%) rename {docs/theme => theme}/images/icons/linkedin.png (100%) rename {docs/theme => theme}/images/icons/rss.png (100%) rename {docs/theme => theme}/images/icons/twitter.png (100%) rename {docs/theme => theme}/js/custom.modernizr.js (100%) rename {docs/theme => theme}/js/foundation.min.js (100%) rename {docs/theme => theme}/js/jquery.js (100%) rename {docs/theme => theme}/js/zepto.js (100%) diff --git a/.gitignore b/.gitignore index 5bfc69f..8b2bc87 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.pyc -output/ +pelican/output/ diff --git a/content/images/2017-06-08-ios-refactoring.png b/2017-06-08-ios-refactoring.png similarity index 100% rename from content/images/2017-06-08-ios-refactoring.png rename to 2017-06-08-ios-refactoring.png diff --git a/Makefile b/Makefile deleted file mode 100644 index 0513c2e..0000000 --- a/Makefile +++ /dev/null @@ -1,124 +0,0 @@ -PY?=python -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=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 --no-mime-magic --no-preserve - -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 stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github diff --git a/docs/archives.html b/archives.html similarity index 84% rename from docs/archives.html rename to archives.html index 2a1cd22..68c6c30 100644 --- a/docs/archives.html +++ b/archives.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -128,19 +128,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/author/opensource-game-studio.html b/author/opensource-game-studio.html similarity index 94% rename from docs/author/opensource-game-studio.html rename to author/opensource-game-studio.html index 15509bd..c7a61e1 100644 --- a/docs/author/opensource-game-studio.html +++ b/author/opensource-game-studio.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -299,19 +299,14 @@ to get up and running real fast.

--> -
Links
+ +
Projects
-
Social
- diff --git a/docs/author/opensource-game-studio2.html b/author/opensource-game-studio2.html similarity index 86% rename from docs/author/opensource-game-studio2.html rename to author/opensource-game-studio2.html index 4a670e5..51dc502 100644 --- a/docs/author/opensource-game-studio2.html +++ b/author/opensource-game-studio2.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -133,19 +133,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/authors.html b/authors.html similarity index 100% rename from docs/authors.html rename to authors.html diff --git a/docs/categories.html b/categories.html similarity index 77% rename from docs/categories.html rename to categories.html index dae009f..f84a933 100644 --- a/docs/categories.html +++ b/categories.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -72,19 +72,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/category/news.html b/category/news.html similarity index 89% rename from docs/category/news.html rename to category/news.html index 9c78cda..160089a 100644 --- a/docs/category/news.html +++ b/category/news.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -134,19 +134,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/category/review.html b/category/review.html similarity index 92% rename from docs/category/review.html rename to category/review.html index ddcdf72..447348a 100644 --- a/docs/category/review.html +++ b/category/review.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -261,19 +261,14 @@ to get up and running real fast.

--> -
Links
+ +
Projects
-
Social
- diff --git a/docs/category/review2.html b/category/review2.html similarity index 84% rename from docs/category/review2.html rename to category/review2.html index 44c70c4..7030113 100644 --- a/docs/category/review2.html +++ b/category/review2.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -115,19 +115,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/develop_server.sh b/develop_server.sh deleted file mode 100755 index 2661df3..0000000 --- a/develop_server.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env bash -## -# This section should match your Makefile -## -PY=${PY:-python} -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 - mkdir -p $OUTPUTDIR && 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 b3a0222..0000000 --- a/fabfile.py +++ /dev/null @@ -1,92 +0,0 @@ -from fabric.api import * -import fabric.contrib.project as project -import os -import shutil -import sys -import SocketServer - -from pelican.server import ComplexHTTPRequestHandler - -# Local path configuration (can be absolute or relative to fabfile) -env.deploy_path = 'output' -DEPLOY_PATH = env.deploy_path - -# Remote server configuration -production = 'root@localhost:22' -dest_path = '/var/www' - -# 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' - -# Github Pages configuration -env.github_pages_branch = "gh-pages" - -# Port for `serve` -PORT = 8000 - -def clean(): - """Remove generated files""" - if os.path.isdir(DEPLOY_PATH): - shutil.rmtree(DEPLOY_PATH) - os.makedirs(DEPLOY_PATH) - -def build(): - """Build local version of site""" - local('pelican -s pelicanconf.py') - -def rebuild(): - """`build` with the delete switch""" - local('pelican -d -s pelicanconf.py') - -def regenerate(): - """Automatically regenerate site upon file modification""" - local('pelican -r -s pelicanconf.py') - -def serve(): - """Serve site at http://localhost:8000/""" - os.chdir(env.deploy_path) - - class AddressReuseTCPServer(SocketServer.TCPServer): - allow_reuse_address = True - - server = AddressReuseTCPServer(('', PORT), ComplexHTTPRequestHandler) - - sys.stderr.write('Serving on port {0} ...\n'.format(PORT)) - server.serve_forever() - -def reserve(): - """`build`, then `serve`""" - build() - serve() - -def preview(): - """Build production version of site""" - local('pelican -s publishconf.py') - -def cf_upload(): - """Publish to Rackspace Cloud Files""" - rebuild() - with lcd(DEPLOY_PATH): - local('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(): - """Publish to production via rsync""" - 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', - ) - -def gh_pages(): - """Publish to GitHub Pages""" - rebuild() - local("ghp-import -b {github_pages_branch} {deploy_path} -p".format(**env)) diff --git a/docs/feeds/all.atom.xml b/feeds/all.atom.xml similarity index 100% rename from docs/feeds/all.atom.xml rename to feeds/all.atom.xml diff --git a/docs/feeds/news.atom.xml b/feeds/news.atom.xml similarity index 100% rename from docs/feeds/news.atom.xml rename to feeds/news.atom.xml diff --git a/docs/feeds/review.atom.xml b/feeds/review.atom.xml similarity index 100% rename from docs/feeds/review.atom.xml rename to feeds/review.atom.xml diff --git a/docs/index.html b/index.html similarity index 94% rename from docs/index.html rename to index.html index 9b17706..60e326b 100644 --- a/docs/index.html +++ b/index.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -299,19 +299,14 @@ to get up and running real fast.

--> -
Links
+ +
Projects
-
Social
- diff --git a/docs/index2.html b/index2.html similarity index 86% rename from docs/index2.html rename to index2.html index 4d573d6..b0b57d6 100644 --- a/docs/index2.html +++ b/index2.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -133,19 +133,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/ios-tutorial-ru.html b/ios-tutorial-ru.html similarity index 92% rename from docs/ios-tutorial-ru.html rename to ios-tutorial-ru.html index 322949e..a1dc941 100644 --- a/docs/ios-tutorial-ru.html +++ b/ios-tutorial-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -124,19 +124,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/ios-tutorial.html b/ios-tutorial.html similarity index 89% rename from docs/ios-tutorial.html rename to ios-tutorial.html index 2b39943..58c1166 100644 --- a/docs/ios-tutorial.html +++ b/ios-tutorial.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -124,19 +124,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/keyboard-review-ru.html b/keyboard-review-ru.html similarity index 80% rename from docs/keyboard-review-ru.html rename to keyboard-review-ru.html index f68b2d6..5fde0c9 100644 --- a/docs/keyboard-review-ru.html +++ b/keyboard-review-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -85,19 +85,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/keyboard-review.html b/keyboard-review.html similarity index 80% rename from docs/keyboard-review.html rename to keyboard-review.html index e09534b..b4aff6c 100644 --- a/docs/keyboard-review.html +++ b/keyboard-review.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -85,19 +85,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr1-ru.html b/kr1-ru.html similarity index 79% rename from docs/kr1-ru.html rename to kr1-ru.html index 4fa9438..775b404 100644 --- a/docs/kr1-ru.html +++ b/kr1-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr1.html b/kr1.html similarity index 79% rename from docs/kr1.html rename to kr1.html index 81709cb..69f6cdb 100644 --- a/docs/kr1.html +++ b/kr1.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr10-ru.html b/kr10-ru.html similarity index 79% rename from docs/kr10-ru.html rename to kr10-ru.html index 1940198..4c831b0 100644 --- a/docs/kr10-ru.html +++ b/kr10-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr10.html b/kr10.html similarity index 79% rename from docs/kr10.html rename to kr10.html index a385e5e..709b148 100644 --- a/docs/kr10.html +++ b/kr10.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr2-ru.html b/kr2-ru.html similarity index 79% rename from docs/kr2-ru.html rename to kr2-ru.html index 3ea0fc5..ee9788f 100644 --- a/docs/kr2-ru.html +++ b/kr2-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr2.html b/kr2.html similarity index 79% rename from docs/kr2.html rename to kr2.html index 19bdace..90ec416 100644 --- a/docs/kr2.html +++ b/kr2.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr3-ru.html b/kr3-ru.html similarity index 79% rename from docs/kr3-ru.html rename to kr3-ru.html index da73f37..67841ba 100644 --- a/docs/kr3-ru.html +++ b/kr3-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr3.html b/kr3.html similarity index 79% rename from docs/kr3.html rename to kr3.html index 545bd6c..03a65b1 100644 --- a/docs/kr3.html +++ b/kr3.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr4-ru.html b/kr4-ru.html similarity index 79% rename from docs/kr4-ru.html rename to kr4-ru.html index e30477b..af39bd7 100644 --- a/docs/kr4-ru.html +++ b/kr4-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr4.html b/kr4.html similarity index 79% rename from docs/kr4.html rename to kr4.html index 899311c..c1cec64 100644 --- a/docs/kr4.html +++ b/kr4.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr5-ru.html b/kr5-ru.html similarity index 79% rename from docs/kr5-ru.html rename to kr5-ru.html index caa9dc7..c942d42 100644 --- a/docs/kr5-ru.html +++ b/kr5-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr5.html b/kr5.html similarity index 79% rename from docs/kr5.html rename to kr5.html index be4bb8c..183a9e9 100644 --- a/docs/kr5.html +++ b/kr5.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr6-ru.html b/kr6-ru.html similarity index 79% rename from docs/kr6-ru.html rename to kr6-ru.html index 8efffea..5249d2f 100644 --- a/docs/kr6-ru.html +++ b/kr6-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr6.html b/kr6.html similarity index 79% rename from docs/kr6.html rename to kr6.html index 812275a..b60bd25 100644 --- a/docs/kr6.html +++ b/kr6.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr7-ru.html b/kr7-ru.html similarity index 79% rename from docs/kr7-ru.html rename to kr7-ru.html index 72b7851..464b46e 100644 --- a/docs/kr7-ru.html +++ b/kr7-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr7.html b/kr7.html similarity index 79% rename from docs/kr7.html rename to kr7.html index 19f6f6e..2567f1f 100644 --- a/docs/kr7.html +++ b/kr7.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr8-ru.html b/kr8-ru.html similarity index 79% rename from docs/kr8-ru.html rename to kr8-ru.html index 756f908..458dd44 100644 --- a/docs/kr8-ru.html +++ b/kr8-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr8.html b/kr8.html similarity index 79% rename from docs/kr8.html rename to kr8.html index d7640c6..da073e3 100644 --- a/docs/kr8.html +++ b/kr8.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr9-ru.html b/kr9-ru.html similarity index 79% rename from docs/kr9-ru.html rename to kr9-ru.html index f769827..5752d11 100644 --- a/docs/kr9-ru.html +++ b/kr9-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/kr9.html b/kr9.html similarity index 79% rename from docs/kr9.html rename to kr9.html index 82b13f2..1341049 100644 --- a/docs/kr9.html +++ b/kr9.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -86,19 +86,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/pages/about-ru.html b/pages/about-ru.html similarity index 78% rename from docs/pages/about-ru.html rename to pages/about-ru.html index c8fb2e1..50895f8 100644 --- a/docs/pages/about-ru.html +++ b/pages/about-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -74,19 +74,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/pages/about.html b/pages/about.html similarity index 78% rename from docs/pages/about.html rename to pages/about.html index a746c8c..765774e 100644 --- a/docs/pages/about.html +++ b/pages/about.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -74,19 +74,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/pages/projects-ru.html b/pages/projects-ru.html similarity index 78% rename from docs/pages/projects-ru.html rename to pages/projects-ru.html index a892ace..6f76d4b 100644 --- a/docs/pages/projects-ru.html +++ b/pages/projects-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -76,19 +76,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/pages/projects.html b/pages/projects.html similarity index 78% rename from docs/pages/projects.html rename to pages/projects.html index e70f7eb..d850fd3 100644 --- a/docs/pages/projects.html +++ b/pages/projects.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -76,19 +76,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/pelican-review-ru.html b/pelican-review-ru.html similarity index 81% rename from docs/pelican-review-ru.html rename to pelican-review-ru.html index f9b6025..cf0b626 100644 --- a/docs/pelican-review-ru.html +++ b/pelican-review-ru.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -88,19 +88,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/pelican-review.html b/pelican-review.html similarity index 81% rename from docs/pelican-review.html rename to pelican-review.html index 76c067d..8bcbba4 100644 --- a/docs/pelican-review.html +++ b/pelican-review.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -88,19 +88,14 @@ to get up and running real fast.

--> -
Links
+ +
Projects
-
Social
- diff --git a/content/articles/2017-06-08-ios-refactoring-ru.md b/pelican/content/articles/2017-06-08-ios-refactoring-ru.md similarity index 100% rename from content/articles/2017-06-08-ios-refactoring-ru.md rename to pelican/content/articles/2017-06-08-ios-refactoring-ru.md diff --git a/content/articles/2017-06-08-ios-refactoring.md b/pelican/content/articles/2017-06-08-ios-refactoring.md similarity index 100% rename from content/articles/2017-06-08-ios-refactoring.md rename to pelican/content/articles/2017-06-08-ios-refactoring.md diff --git a/content/articles/keyboard-review-ru.md b/pelican/content/articles/keyboard-review-ru.md similarity index 100% rename from content/articles/keyboard-review-ru.md rename to pelican/content/articles/keyboard-review-ru.md diff --git a/content/articles/keyboard-review.md b/pelican/content/articles/keyboard-review.md similarity index 100% rename from content/articles/keyboard-review.md rename to pelican/content/articles/keyboard-review.md diff --git a/content/articles/kr1-ru.md b/pelican/content/articles/kr1-ru.md similarity index 100% rename from content/articles/kr1-ru.md rename to pelican/content/articles/kr1-ru.md diff --git a/content/articles/kr1.md b/pelican/content/articles/kr1.md similarity index 100% rename from content/articles/kr1.md rename to pelican/content/articles/kr1.md diff --git a/content/articles/kr10-ru.md b/pelican/content/articles/kr10-ru.md similarity index 100% rename from content/articles/kr10-ru.md rename to pelican/content/articles/kr10-ru.md diff --git a/content/articles/kr10.md b/pelican/content/articles/kr10.md similarity index 100% rename from content/articles/kr10.md rename to pelican/content/articles/kr10.md diff --git a/content/articles/kr2-ru.md b/pelican/content/articles/kr2-ru.md similarity index 100% rename from content/articles/kr2-ru.md rename to pelican/content/articles/kr2-ru.md diff --git a/content/articles/kr2.md b/pelican/content/articles/kr2.md similarity index 100% rename from content/articles/kr2.md rename to pelican/content/articles/kr2.md diff --git a/content/articles/kr3-ru.md b/pelican/content/articles/kr3-ru.md similarity index 100% rename from content/articles/kr3-ru.md rename to pelican/content/articles/kr3-ru.md diff --git a/content/articles/kr3.md b/pelican/content/articles/kr3.md similarity index 100% rename from content/articles/kr3.md rename to pelican/content/articles/kr3.md diff --git a/content/articles/kr4-ru.md b/pelican/content/articles/kr4-ru.md similarity index 100% rename from content/articles/kr4-ru.md rename to pelican/content/articles/kr4-ru.md diff --git a/content/articles/kr4.md b/pelican/content/articles/kr4.md similarity index 100% rename from content/articles/kr4.md rename to pelican/content/articles/kr4.md diff --git a/content/articles/kr5-ru.md b/pelican/content/articles/kr5-ru.md similarity index 100% rename from content/articles/kr5-ru.md rename to pelican/content/articles/kr5-ru.md diff --git a/content/articles/kr5.md b/pelican/content/articles/kr5.md similarity index 100% rename from content/articles/kr5.md rename to pelican/content/articles/kr5.md diff --git a/content/articles/kr6-ru.md b/pelican/content/articles/kr6-ru.md similarity index 100% rename from content/articles/kr6-ru.md rename to pelican/content/articles/kr6-ru.md diff --git a/content/articles/kr6.md b/pelican/content/articles/kr6.md similarity index 100% rename from content/articles/kr6.md rename to pelican/content/articles/kr6.md diff --git a/content/articles/kr7-ru.md b/pelican/content/articles/kr7-ru.md similarity index 100% rename from content/articles/kr7-ru.md rename to pelican/content/articles/kr7-ru.md diff --git a/content/articles/kr7.md b/pelican/content/articles/kr7.md similarity index 100% rename from content/articles/kr7.md rename to pelican/content/articles/kr7.md diff --git a/content/articles/kr8-ru.md b/pelican/content/articles/kr8-ru.md similarity index 100% rename from content/articles/kr8-ru.md rename to pelican/content/articles/kr8-ru.md diff --git a/content/articles/kr8.md b/pelican/content/articles/kr8.md similarity index 100% rename from content/articles/kr8.md rename to pelican/content/articles/kr8.md diff --git a/content/articles/kr9-ru.md b/pelican/content/articles/kr9-ru.md similarity index 100% rename from content/articles/kr9-ru.md rename to pelican/content/articles/kr9-ru.md diff --git a/content/articles/kr9.md b/pelican/content/articles/kr9.md similarity index 100% rename from content/articles/kr9.md rename to pelican/content/articles/kr9.md diff --git a/content/articles/pelican-review-ru.md b/pelican/content/articles/pelican-review-ru.md similarity index 100% rename from content/articles/pelican-review-ru.md rename to pelican/content/articles/pelican-review-ru.md diff --git a/content/articles/pelican-review.md b/pelican/content/articles/pelican-review.md similarity index 100% rename from content/articles/pelican-review.md rename to pelican/content/articles/pelican-review.md diff --git a/docs/2017-06-08-ios-refactoring.png b/pelican/content/images/2017-06-08-ios-refactoring.png similarity index 100% rename from docs/2017-06-08-ios-refactoring.png rename to pelican/content/images/2017-06-08-ios-refactoring.png diff --git a/content/pages/About-ru.md b/pelican/content/pages/About-ru.md similarity index 100% rename from content/pages/About-ru.md rename to pelican/content/pages/About-ru.md diff --git a/content/pages/About.md b/pelican/content/pages/About.md similarity index 100% rename from content/pages/About.md rename to pelican/content/pages/About.md diff --git a/content/pages/Projects-ru.md b/pelican/content/pages/Projects-ru.md similarity index 100% rename from content/pages/Projects-ru.md rename to pelican/content/pages/Projects-ru.md diff --git a/content/pages/Projects.md b/pelican/content/pages/Projects.md similarity index 100% rename from content/pages/Projects.md rename to pelican/content/pages/Projects.md diff --git a/pelicanconf.py b/pelican/pelicanconf.py similarity index 100% rename from pelicanconf.py rename to pelican/pelicanconf.py diff --git a/publishconf.py b/pelican/publishconf.py similarity index 96% rename from publishconf.py rename to pelican/publishconf.py index 878b779..93178cd 100644 --- a/publishconf.py +++ b/pelican/publishconf.py @@ -23,4 +23,4 @@ DELETE_OUTPUT_DIRECTORY = True #DISQUS_SITENAME = "" #GOOGLE_ANALYTICS = "" -OUTPUT_PATH = 'docs/' +OUTPUT_PATH = '..' diff --git a/docs/tags.html b/tags.html similarity index 76% rename from docs/tags.html rename to tags.html index 5567c4e..16decdb 100644 --- a/docs/tags.html +++ b/tags.html @@ -30,9 +30,9 @@
+ Projects + About - About - Projects
@@ -72,19 +72,14 @@ --> -
Links
+ +
Projects
-
Social
- diff --git a/docs/theme/css/foundation.min.css b/theme/css/foundation.min.css similarity index 100% rename from docs/theme/css/foundation.min.css rename to theme/css/foundation.min.css diff --git a/docs/theme/css/normalize.css b/theme/css/normalize.css similarity index 100% rename from docs/theme/css/normalize.css rename to theme/css/normalize.css diff --git a/docs/theme/css/pygments.css b/theme/css/pygments.css similarity index 100% rename from docs/theme/css/pygments.css rename to theme/css/pygments.css diff --git a/docs/theme/css/style.css b/theme/css/style.css similarity index 100% rename from docs/theme/css/style.css rename to theme/css/style.css diff --git a/docs/theme/images/icons/delicious.png b/theme/images/icons/delicious.png similarity index 100% rename from docs/theme/images/icons/delicious.png rename to theme/images/icons/delicious.png diff --git a/docs/theme/images/icons/facebook.png b/theme/images/icons/facebook.png similarity index 100% rename from docs/theme/images/icons/facebook.png rename to theme/images/icons/facebook.png diff --git a/docs/theme/images/icons/github.png b/theme/images/icons/github.png similarity index 100% rename from docs/theme/images/icons/github.png rename to theme/images/icons/github.png diff --git a/docs/theme/images/icons/gitorious.png b/theme/images/icons/gitorious.png similarity index 100% rename from docs/theme/images/icons/gitorious.png rename to theme/images/icons/gitorious.png diff --git a/docs/theme/images/icons/gittip.png b/theme/images/icons/gittip.png similarity index 100% rename from docs/theme/images/icons/gittip.png rename to theme/images/icons/gittip.png diff --git a/docs/theme/images/icons/google-plus.png b/theme/images/icons/google-plus.png similarity index 100% rename from docs/theme/images/icons/google-plus.png rename to theme/images/icons/google-plus.png diff --git a/docs/theme/images/icons/lastfm.png b/theme/images/icons/lastfm.png similarity index 100% rename from docs/theme/images/icons/lastfm.png rename to theme/images/icons/lastfm.png diff --git a/docs/theme/images/icons/linkedin.png b/theme/images/icons/linkedin.png similarity index 100% rename from docs/theme/images/icons/linkedin.png rename to theme/images/icons/linkedin.png diff --git a/docs/theme/images/icons/rss.png b/theme/images/icons/rss.png similarity index 100% rename from docs/theme/images/icons/rss.png rename to theme/images/icons/rss.png diff --git a/docs/theme/images/icons/twitter.png b/theme/images/icons/twitter.png similarity index 100% rename from docs/theme/images/icons/twitter.png rename to theme/images/icons/twitter.png diff --git a/docs/theme/js/custom.modernizr.js b/theme/js/custom.modernizr.js similarity index 100% rename from docs/theme/js/custom.modernizr.js rename to theme/js/custom.modernizr.js diff --git a/docs/theme/js/foundation.min.js b/theme/js/foundation.min.js similarity index 100% rename from docs/theme/js/foundation.min.js rename to theme/js/foundation.min.js diff --git a/docs/theme/js/jquery.js b/theme/js/jquery.js similarity index 100% rename from docs/theme/js/jquery.js rename to theme/js/jquery.js diff --git a/docs/theme/js/zepto.js b/theme/js/zepto.js similarity index 100% rename from docs/theme/js/zepto.js rename to theme/js/zepto.js