don/www.duckland.org
1
0
Fork 0
Code Issues Pull requests Releases Activity

a few updates since last commit

Browse source
This commit is contained in:
Don Harper 2015-09-09 22:17:23 -05:00
parent dae95027aa
commit 33a1a23ad4
8 changed files with 80 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

40
conf.py
View file

@ -14,14 +14,14 @@ NAVIGATION_LINKS = {
DEFAULT_LANG: (
('/index.html', 'Home'),
('/stories/about.html', 'About me'),
(
(
('http://www.donaldharper.com', 'My Photo Blog'),
('http://p365.donaldharper.com', 'My Attempt at a Project 365'),
('http://www.duckland.org', 'My Personal and Tech Blog'),
),
'My Sites'
),
#(
#(
#('http://www.donaldharper.com', 'My Photo Blog'),
#('http://p365.donaldharper.com', 'My Attempt at a Project 365'),
#('http://www.duckland.org', 'My Personal and Tech Blog'),
#),
#'My Sites'
#),
(
(
('https://twitter.com/duckunix', 'My Twitter'),
@ -71,8 +71,8 @@ SHOW_BLOG_TITLE = True
FEED_LENGTH = 10
REDIRECTIONS = []
IMAGE_FOLDERS = {'images': 'images'}
INDEX_READ_MORE_LINK = '<p class="more"><a href="{link}">{read_more}…</a></p>'
RSS_READ_MORE_LINK = '<p><a href="{link}">{read_more}…</a> ({min_remaining_read})</p>'
INDEX_READ_MORE_LINK = '<p class="more"><a href="{link}">{read_more}</a></p>'
RSS_READ_MORE_LINK = '<p><a href="{link}">{read_more}</a> ({min_remaining_read})</p>'
RSS_LINKS_APPEND_QUERY = False
DEPLOY_COMMANDS = {
'default': [
@ -116,3 +116,23 @@ GLOBAL_CONTEXT_FILLER = []
CREATE_MONTHLY_ARCHIVE = True
#ARCHIVE_PATH = "posts"
#ARCHIVE_FILENAME = "index.html"
COIL_SECRET_KEY = b'\x8a\x0f{\x11\xf4\x0c\x92\x86\x14\xc0\xfb\xeeM\xb2\xc1\xa5r\xe12Q\x81GC%'
COIL_URL = 'http://coil.duckland.org/'
_MAKO_DISABLE_CACHING = True
COIL_LIMITED = True
COIL_USERS = {
'1': {
'username': 'don',
'realname': 'Don Harper',
'password': '$bcrypt-sha256$2a,12$St3N7xoStL7Doxpvz78Jve$3vKfveUNhMNhvaFEfJllWEarb5oNgNu',
'must_change_password': False,
'email': 'info@getnikola.com',
'active': True,
'is_admin': True,
'can_edit_all_posts': True,
'wants_all_posts': True,
'can_upload_attachments': True,
'can_rebuild_site': True,
'can_transfer_post_authorship': True,
},
}

43
plugins/vcs/README.md
View file

@ -1,43 +0,0 @@
This **EXPERIMENTAL** plugin tries to make it easy to keep your site in a version control system.
**There are problems in the anyvc support of python 3. So, use this only in python2 until
I figure that out.**
**REMEMBER**, this is a first iteration, it's probably buggy, so be careful, and only use it
if you are experienced with your VCS, ok?
How to use it:
1. Choose your favourite VCS between git, bzr, subversion, mercurial.
2. Initialize the repo in your site (for example: ``git init .``)
3. Install this plugin: ``nikola plugin -i vcs``
4. Run ``nikola vcs``
5. Check what happened (for example: ``git status`` and ``git log``)
6. Use your site as usual, creating posts, adding stuff or removing it
7. GOTO 4.
8. You may want to add ``nikola vcs`` to your deploy commands.
What it should do:
1. Add a lot of stuff to the repo:
* All your posts
* All your pages
* All your galleries' images
* All your listings
* All your static files
* Your themes
* Your plugins
* Your conf.py
2. Remove stuff if you removed it
3. Commit stuff if you changed it
What it should **NOT** do:
1. Lose your data
2. Push it anywhere (yet)
3. Manage your output (consider ``github_deploy`` would not like it!)
Please report anything missing, or any ideas on how to improve this, where you want this to go
by [filing issues](https://github.com/getnikola/plugins/issues).

2
plugins/vcs/requirements.txt
View file

@ -1,2 +0,0 @@
anyvc
py

9
plugins/vcs/vcs.plugin
View file

@ -1,9 +0,0 @@
[Core]
Name = vcs
Module = vcs
[Documentation]
Author = Roberto Alsina
Version = 1.0
Website = https://getnikola.com
Description = Site vcs

114
plugins/vcs/vcs.py
View file

@ -1,114 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright © 2015 Roberto Alsina.
# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
# documentation files (the "Software"), to deal in the
# Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the
# Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice
# shall be included in all copies or substantial portions of
# the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import print_function
import os
from py.path import local
from anyvc import workdir
from nikola.plugin_categories import Command
from nikola.utils import get_logger
def get_path_list(path):
'''Walk path and return a list of everything in it.'''
paths = []
for root, dirs, files in os.walk(path, followlinks=True):
for fname in files:
fpath = os.path.join(root, fname)
paths.append(fpath)
return list(set(paths))
class CommandVCS(Command):
""" Site status. """
name = "vcs"
doc_purpose = "display site status"
doc_description = "Show information about the posts and site deployment."
logger = None
cmd_options = []
def _execute(self, options, args):
logger = get_logger('vcs', self.site.loghandlers)
self.site.scan_posts()
repo_path = local('.')
wd = workdir.open(repo_path)
# See if anything got deleted
del_paths = []
flag = False
for s in wd.status():
if s.state == 'removed':
if not flag:
logger.info('Found deleted files')
flag = True
logger.info('DEL => {}', s.relpath)
del_paths.append(s.relpath)
if flag:
logger.info('Marking as deleted')
wd.remove(paths=del_paths)
wd.commit(message='Deleted Files', paths=del_paths)
# Collect all paths that should be kept under control
# Post and page sources
paths = []
for lang in self.site.config['TRANSLATIONS']:
for p in self.site.timeline:
paths.extend(p.fragment_deps(lang))
# Files in general
for k, v in self.site.config['FILES_FOLDERS'].items():
paths.extend(get_path_list(k))
for k, v in self.site.config['LISTINGS_FOLDERS'].items():
paths.extend(get_path_list(k))
for k, v in self.site.config['GALLERY_FOLDERS'].items():
paths.extend(get_path_list(k))
# Themes and plugins
for p in ['plugins', 'themes']:
paths.extend(get_path_list(p))
# The configuration
paths.extend('conf.py')
# Add them to the VCS
paths = list(set(paths))
wd.add(paths=paths)
flag = False
for s in wd.status():
if s.state == 'added':
if not flag:
logger.info('Found new files')
flag = True
logger.info('NEW => {}', s.relpath)
logger.info('Committing changes')
wd.commit(message='Updated files')

32
posts/2015/06/moving.rst
View file

@ -4,20 +4,24 @@
.. tags: personal,work
.. category:
.. link:
.. previewimage: /images/Moving/HP_logo.png
.. description:
.. type: text
.. annotations:
.. author: Don Harper
.. author.uid: 1
.. previewimage: /images/Moving/HP_logo.png
.. updated: 2015-06-12 10:30:39 UTC-05:00
.. image:: /images/Moving/HP_logo.png
:alt: HP logo
:height: 100px
:width: 100px
:align: left
Well, after 4 years (almost to the day), it is time for me to say good-bye to HP. The team I worked on is a great team who really know their stuff. However, I am a geek, and I want to be doing things with tech, and not talking about tech,, and for the most part, talking is all I have been doing. I have learned a lot and was given a chance to do some :doc:`traveling <travels>` which I do not think I would have been able to do.
So, where am I going? Well, until after I start and get on-boarded, I am not sure how much I can say. It is a financial company based in Houston, so I will not be moving the crew, just changing the direction I commute back to into the sun again.
Stay tuned here for more updates, and I will probably be using this as a place to document some of the new things I learn on the way.
Peace.
.. image:: /images/Moving/HP_logo.png
:alt: HP logo
:height: 100px
:width: 100px
:align: left
Well, after 4 years (almost to the day), it is time for me to say good-bye to HP. The team I worked on is a great team who really know their stuff. However, I am a geek, and I want to be doing things with tech, and not talking about tech, and for the most part, talking is all I have been doing. I have learned a lot and was given a chance to do some :doc:`traveling <travels>` which I do not think I would have been able to do.
So, where am I going? Well, until after I start and get on-boarded, I am not sure how much I can say. It is a financial company based in Houston, so I will not be moving the crew, just changing the direction I commute back to into the sun again.
Stay tuned here for more updates, and I will probably be using this as a place to document some of the new things I learn on the way.
Peace.

16
posts/another-month-another-post.html Normal file
View file

@ -0,0 +1,16 @@
<!--
.. title: Another Month, Another Post
.. slug: another-month-another-post
.. date: 2015-09-09 21:47:02 UTC-05:00
.. tags: sitenews
.. category:
.. link:
.. description:
.. type: text
.. annotations:
.. author: Don Harper
.. author.uid: 1
.. updated: 2015-09-09 21:47:02 UTC-05:00
-->
Wow...September already? &nbsp;Where does the time go?<br><br>With the time given to the commute and the lack of access at the office (since I do work for a firm which does have pretty tight internet access policies), I have decided that I cannot do the photo-a-day thing, so I am not going to be updating my <a href="http://www.donaldharper.com">photo website</a>&nbsp;on a regular basis. &nbsp;Sorry about that, but then since I started back this summer, the traffic was not there.<br><br>On the topic of my <a href="http://www.duckland.org/posts/do-i-stay-or-do-i-go.html">last post</a>, I have decided to keep most things in house for now. &nbsp;Calendaring is the biggest issue to crack.<br><br>I hope to be able to spend some time here documenting things, if nothing else for me. &nbsp;Maybe someone else will find them useful.<br><br>Peace,<br>d<br><br><br>

27
stories/about.rst
View file

@ -2,18 +2,23 @@
.. slug: about
.. date: 2014-12-05 09:00:28 UTC-06:00
.. tags:
.. category:
.. link:
.. description:
.. type: text
.. annotations:
.. author: Don Harper
.. author.uid: 1
.. updated: 2014-12-05 09:00:28 UTC-06:00
=====
About
=====
Hello.
This is the ramblings about my life, my hobbies, and my thoughts.I am a second generation systems engineer.
I grew up with my father telecommuting to the mainframe during the 1970's. I have been earning money supporting open software for over 20 years now, and most of that time Linux. My first kernel I installed was 0.92. I first RHCE was in July 1999 for Red Hat 6.0. Not RHEL 6.0, Red Hat 6.0.I am also a photographer. I tend to do natural and suburban, but I have been known to do some travel and environmental portraiture as well.
=====
About
=====
Hello.
This is the ramblings about my life, my hobbies, and my thoughts.I am a second generation systems engineer.
I grew up with my father telecommuting to the 'minicomputers' during the 1970's. I have been earning money supporting open software for over 20 years now, and most of that time Linux. My first kernel I installed was 0.92. I first RHCE was in July 1999 for Red Hat 6.0. Not RHEL 6.0, Red Hat 6.0. I am also a photographer. I tend to do natural and suburban, but I have been known to do some travel and environmental portraiture as well.