phd.pp.ru => phdru.name.

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@117 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/Makefile b/Makefile
index e5bcbd1e5f45556b12f7741358e81789c545533d..be2792032c23f5a4ad6cb93dd3469638d72adf51 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 # Makefile.
 #
-# This file is a part of phd.pp.ru homepage/blog/news generator scripts.
-# Author: Oleg BroytMan <phd@phd.pp.ru>.
-# Copyright: (C) 2006-2009 PhiloSoft Design.
+# This file is a part of phdru.name homepage/blog/news generator scripts.
+# Author: Oleg BroytMan <phd@phdru.name>.
+# Copyright: (C) 2006-2010 PhiloSoft Design.
 
 # __version__ = "$Revision$"[11:-2]
 # __revision__ = "$Id$"
 # __date__ = "$Date$"[7:-2]
-# __author__ = "Oleg Broytman <phd@phd.pp.ru>"
-# __copyright__ = "Copyright (C) 2006-2009 PhiloSoft Design"
+# __author__ = "Oleg Broytman <phd@phdru.name>"
+# __copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
 
 
 %.py: %.tmpl
@@ -18,13 +18,13 @@
        @(umask 022; PYTHONPATH=. cheetah fill --nobackup $<)
 
 
-.PHONY: phd.pp.ru
-phd.pp.ru: phd_pp_ru.py news blog html
+.PHONY: phdru.name
+phdru.name: phd_site.py news blog html
 
 
 .PHONY: news
 news: atom_10.py rss_20.py
-       @(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phd.pp.ru && ./make-news.py ru ../htdocs/phd.pp.ru/Russian)
+       @(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name/public_html && ./make-news.py ru ../htdocs/phdru.name/public_html/Russian)
 
 
 .PHONY: blog
@@ -32,7 +32,7 @@ blog: atom_10.py rss_20.py
        @./reindex_blog_ru
 
 
-templates = $(shell find ../htdocs/phd.pp.ru -type f -name \*.tmpl -print)
+templates = $(shell find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html

diff --git a/atom_10.tmpl b/atom_10.tmpl
index 1c8ac1b3181cc494c420d809939f4e47239f54bd..c8bb7db1384815d4a6ae1954e69070a416dff562 100644 (file)
--- a/atom_10.tmpl
+++ b/atom_10.tmpl
@@ -10,7 +10,7 @@
     <name>$author</name>
     <email>$email</email>
   </author>
-  <generator uri="http://phd.pp.ru/about/make/${generator}.txt">http://phd.pp.ru/about/make/${generator}.txt</generator>
+  <generator uri="http://phdru.name/about/make/${generator}.txt">http://phdru.name/about/make/${generator}.txt</generator>
 #for $post in $posts
   <entry>
     <title>$post.title</title>

diff --git a/dotfiles2html/dotfiles2html.py b/dotfiles2html/dotfiles2html.py
index 7c1595af41ffe563cf3c02a52b3f155615369ff0..e7c3a41bb57d38fe876de100fd1d7e9b8344c64f 100755 (executable)
--- a/dotfiles2html/dotfiles2html.py
+++ b/dotfiles2html/dotfiles2html.py
@@ -3,7 +3,7 @@
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2004-2010 PhiloSoft Design"
 
 import os, shutil, filecmp
@@ -32,7 +32,7 @@ def add_headers(fname, first, prev, next, last):
        txt_name = fname
 
    html_file = open(html_fname, 'w')
-   html_file.write("#extends phd_pp_ru\n")
+   html_file.write("#extends phd_site\n")
    html_file.write("#implements respond\n")
    html_file.write("#attr $Title = \"%s\"\n" % dot_name)
    html_file.write("#attr $Copyright = 2003\n")
@@ -51,7 +51,7 @@ def add_headers(fname, first, prev, next, last):
    html_file.write(html)
    html_file.write("#end raw\n")
    html_file.write("#end def\n")
-   html_file.write("$phd_pp_ru.respond(self)\n")
+   html_file.write("$phd_site.respond(self)\n")
    html_file.close()
 
 

diff --git a/make-all b/make-all
index 7bc7b8838290a34b2aaa8dc739e6c1594828495c..544d59edc85a04602ea58a7fcc7eb94ca5cc64a6 100755 (executable)
--- a/make-all
+++ b/make-all
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-find ../htdocs/phd.pp.ru -type f -name \*.tmpl -print0 | \
+find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print0 | \
    xargs -r0 ./make-files

diff --git a/make-changed b/make-changed
index a6c1b134e90eb655f71113e4d2bfc7c3815f54b7..f579a0939988352aaf81ce8e7c0b6e0f59cb7b7c 100755 (executable)
--- a/make-changed
+++ b/make-changed
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-find ../htdocs/phd.pp.ru -type f -name \*.tmpl -print | \
+find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print | \
    ./make-changed.py | xargs -r ./make-files

diff --git a/make-changed.py b/make-changed.py
index 31443aac84b7035ae93e743f1bc45914db9a12ff..24643948d8a66d8d2b58131acb1741fbce51936f 100755 (executable)
--- a/make-changed.py
+++ b/make-changed.py
@@ -2,8 +2,8 @@
 
 import sys, os
 
-main_tmpl_mtime = os.path.getmtime("phd_pp_ru.tmpl")
-main_prog_mtime = os.path.getmtime("phd_pp.py")
+main_prog_mtime = os.path.getmtime("phd.py")
+main_tmpl_mtime = os.path.getmtime("phd_site.tmpl")
 
 for line in sys.stdin:
    line = line.strip()
@@ -16,7 +16,7 @@ for line in sys.stdin:
       make = True
    else:
       make = (src_mtime > dest_mtime) or \
-         (main_tmpl_mtime > dest_mtime) or (main_prog_mtime > dest_mtime)
+         (main_prog_mtime > dest_mtime) or (main_tmpl_mtime > dest_mtime)
 
    if make:
       print line

diff --git a/make-files b/make-files
index 43b9c010a906db3b865585030a28d7c519214ee8..49d5182896417286bf00c00eb5fbaa7aaa1c9370 100755 (executable)
--- a/make-files
+++ b/make-files
@@ -4,8 +4,8 @@ umask 022
 PYTHONPATH=.
 export PYTHONPATH
 
-if [ phd_pp_ru.tmpl -nt phd_pp_ru.py ]; then
-   cheetah compile --nobackup phd_pp_ru.tmpl
+if [ phd_site.tmpl -nt phd_site.py ]; then
+   cheetah compile --nobackup phd_site.tmpl
 fi
 
 exec cheetah fill --nobackup "$@"

diff --git a/make-new b/make-new
index f3c359bdb1ba5ed9f9fd58f596606c2180c3201f..5ede80c710787eec54e5cb88286e973679ee567a 100755 (executable)
--- a/make-new
+++ b/make-new
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-find ../htdocs/phd.pp.ru -type f -name \*.tmpl -mtime -1 -print0 | \
+find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -mtime -1 -print0 | \
    xargs -r0 ./make-files

diff --git a/make-news.py b/make-news.py
index e0779cf28e51e65c3ef7f369c74a4763aed8af0e..19ed93e2710b046c49867442bdbe0f0d63c0847e 100755 (executable)
--- a/make-news.py
+++ b/make-news.py
@@ -4,7 +4,7 @@
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2006-2009 PhiloSoft Design"
 
 
@@ -51,7 +51,7 @@ elif lang == "ru":
 new_text.append("""\
 </p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 
 write_if_changed(os.path.join(root, "news.tmpl"), ''.join(new_text))
@@ -62,19 +62,19 @@ from rss_20 import rss_20
 
 namespace = {
    "title": "Oleg Broytman's Personal Page - News",
-   "baseURL": "http://phd.pp.ru/",
+   "baseURL": "http://phdru.name/",
    "indexFile": "news.html",
    "description": "",
    "lang": lang,
    "author": "Oleg Broytman",
-   "email": "phd@phd.pp.ru",
+   "email": "phd@phdru.name",
    "generator": os.path.basename(sys.argv[0]),
    "posts": news_items,
 }
 
 if lang == "ru":
    namespace["title"] = "Oleg Broytman's Personal Page - Russian News"
-   namespace["baseURL"] = baseURL = "http://phd.pp.ru/Russian/"
+   namespace["baseURL"] = baseURL = "http://phdru.name/Russian/"
    for item in news_items:
       item.baseURL = baseURL
 

diff --git a/news.py b/news.py
index 0ee227090de30fef1680cb3d1a4559df50ed9d7e..f454592f45d0d0e84db15ae063d9be12123dc718 100644 (file)
--- a/news.py
+++ b/news.py
@@ -3,8 +3,8 @@
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2006-2009 PhiloSoft Design"
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
 __docformat__ = "epytext en"
 
 __all__ = ["get_news", "write_if_changed"]
@@ -14,7 +14,7 @@ from datetime import date
 from urlparse import urljoin
 
 class NewsItem(object):
-   baseURL = "http://phd.pp.ru/"
+   baseURL = "http://phdru.name/"
    excerpt = None
    content = None
    categoryList = []

diff --git a/news.tmpl-en b/news.tmpl-en
index bd15194f29a98ad9d56176a875fc84367d4178a4..1d00518c2f0cb106766b67b903a6c1d4bffb8e5c 100644 (file)
--- a/news.tmpl-en
+++ b/news.tmpl-en
@@ -1,4 +1,4 @@
-#extends phd_pp_ru
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's Personal Page - News"
 #attr $Description = "Broytman News Page Index Document"

diff --git a/news.tmpl-ru b/news.tmpl-ru
index ce54afe4767cac5827f1343cf5c869b5cf355bd7..7e4c1cb4ffad129a6655f50aa66191a3687fa932 100644 (file)
--- a/news.tmpl-ru
+++ b/news.tmpl-ru
@@ -1,4 +1,4 @@
-#extends phd_pp_ru
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's Personal Page - News"
 #attr $Description = "Broytman News Page Index Document"

diff --git a/phd_pp.py b/phd.py
similarity index 99%
rename from phd_pp.py
rename to phd.py
index d4b2e3211747d7ba54f11aecfa50c7cfc4e9ce52..e12fb902cb88599af9dfc49a13a361df6c4d9f0d 100644 (file)
--- a/phd_pp.py
+++ b/phd.py
@@ -11,7 +11,7 @@ def _url2href(match):
 
 full_dirs = len(os.getcwd().split('/')) + 1
 
-class phd_pp(Template):
+class phd(Template):
    def __init__(self, *args, **kw):
       if not hasattr(self, "_fileBaseName"):
          self._fileDirName, self._fileBaseName = os.path.split(os.path.abspath(self._CHEETAH_src))

diff --git a/phd_pp_ru.tmpl b/phd_site.tmpl
similarity index 89%
rename from phd_pp_ru.tmpl
rename to phd_site.tmpl
index 8f9effbda6871a92c33c90a64143fabd676751ed..bf636a498b5581cb0743ea983e82c4716142d6e2 100644 (file)
--- a/phd_pp_ru.tmpl
+++ b/phd_site.tmpl
@@ -1,5 +1,5 @@
 #encoding koi8-r
-#extends phd_pp
+#extends phd
 #implements respond
 #attr $Lead = ''
 #attr $Title = ''
@@ -24,7 +24,7 @@
 <!-- THIS PAGE IS AUTOMATICALLY GENERATED USING CheetahTemplate. DO NOT EDIT. -->
 <head>
 <meta HTTP-Equiv="Content-Type" content="text/html">
-<meta HTTP-Equiv="Content-Location" content="http://phd.pp.ru$path">
+<meta HTTP-Equiv="Content-Location" content="http://phdru.name$path">
 <meta HTTP-Equiv="Last-Modified" content="$last_modified_en">
 <title>$Title</title>
 #if $refresh:
@@ -50,7 +50,7 @@
 <meta name="copyright" content="&copy; $full_copyright PhiloSoft Design">
 <link rel="copyright" href="$copy_href" title="&copy; $full_copyright PhiloSoft Design">
 #end if
-<link rev="made" href="mailto:phd@phd.pp.ru">
+<link rev="made" href="mailto:phd@phdru.name">
 <meta name="generator" content="CheetahTemplate">
 <meta name="robots" content="index, follow">
 #if $root
@@ -96,10 +96,10 @@ $style
 #end if
 <link rel="shortcut icon" href="${root}favicon.ico">
 #if not $root
-<link rel="openid.delegate" href="http://phd.pp.ru/">
-<link rel="openid2.local_id" href="http://phd.pp.ru/">
-<link rel="openid.server" href="http://phd.pp.ru/cgi-bin/poit.py">
-<link rel="openid2.provider" href="http://phd.pp.ru/cgi-bin/poit.py">
+<link rel="openid.delegate" href="http://phdru.name/">
+<link rel="openid2.local_id" href="http://phdru.name/">
+<link rel="openid.server" href="http://phdru.name/cgi-bin/poit.py">
+<link rel="openid2.provider" href="http://phdru.name/cgi-bin/poit.py">
 #end if
 <meta name="MSSmartTagsPreventParsing" content="TRUE"> <!-- MUST DIE -->
 </head>
@@ -134,13 +134,13 @@ $link_tag($tag)
 #set $path = $path[:-len("index.html")]
 #end if
 #if $path.startswith("/Russian/")
-<p class="head" style="font-size: 60%">��� �������� <a href="http://phd.pp.ru$path">http://phd.pp.ru$path</a>
+<p class="head" style="font-size: 60%">��� �������� <a href="http://phdru.name$path">http://phdru.name$path</a>
 ���� ������������� $last_modified_ru �� ������� CheetahTemplate <a href="$_fileBaseName">$_fileBaseName</a>;
 <a href="${root}Russian/free.html">��������� ����� ���������������</a>.
 �� ������ ������ <a href="${root}about/">�</a> <a href="${root}about/technical.html">�����������</a> �������� ����� �����.
 </p>
 #else
-<p class="head" style="font-size: 60%">This is the page <a href="http://phd.pp.ru$path">http://phd.pp.ru$path</a>.
+<p class="head" style="font-size: 60%">This is the page <a href="http://phdru.name$path">http://phdru.name$path</a>.
 It was generated on $last_modified_en from CheetahTemplate <a href="$_fileBaseName">$_fileBaseName</a>.
 <a href="./${root}free.html">Some rights are reserved</a>.
 Read more <a href="${root}about/">about</a> <a href="${root}about/technical.html">technical</a> aspects of the site.

diff --git a/reindex_blog.py b/reindex_blog.py
index cc9a540a5d103631d953f0842e22837bea9b038a..6c2717c3b49695b4f6d7c4f4a6964a7bea210a03 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -4,7 +4,7 @@
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
 
 
@@ -128,7 +128,7 @@ def write_template(level, year, month, day, titles, tags=None):
 
    new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#extends phd_site
 #implements respond
 """]
 
@@ -281,7 +281,7 @@ def write_template(level, year, month, day, titles, tags=None):
 
    new_text.append("""\
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 
    write_if_changed(index_name, ''.join(new_text))
@@ -334,7 +334,7 @@ write_template(0, year, month, day, all_titles[-20:], all_tags)
 
 new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tags"
 #attr $Description = "Broytman Russian Blog Tags Index Document"
@@ -365,7 +365,7 @@ for i, (count, tag, links) in enumerate(all_tags):
 
    tag_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tag %s"
 #attr $Description = "Broytman Russian Blog Tag %s Index Document"
@@ -414,7 +414,7 @@ for i, (count, tag, links) in enumerate(all_tags):
 </ul>
 </p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
    write_if_changed(os.path.join(blog_root, "tags", tag+".tmpl"), ''.join(tag_text))
 
@@ -422,7 +422,7 @@ new_text.append("""\
 </dl>
 </p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 write_if_changed(os.path.join(blog_root, "tags", "index.tmpl"), ''.join(new_text))
 
@@ -502,9 +502,9 @@ from rss_20 import rss_20
 from news import NewsItem
 
 if blog_root:
-   baseURL = "http://phd.pp.ru/%s/" % blog_root
+   baseURL = "http://phdru.name/%s/" % blog_root
 else:
-   baseURL = "http://phd.pp.ru/"
+   baseURL = "http://phdru.name/"
 
 items = []
 for item in tuple(reversed(all_titles_tags))[:10]:
@@ -529,7 +529,7 @@ namespace = {
    "description": "",
    "lang": "ru",
    "author": "Oleg Broytman",
-   "email": "phd@phd.pp.ru",
+   "email": "phd@phdru.name",
    "generator": os.path.basename(sys.argv[0]),
    "posts": items,
 }

diff --git a/reindex_blog_ru b/reindex_blog_ru
index c8816351cd8aa5d874d40a796bb0c73322dc7820..795047d04979d385dcf888fac6069a190a62ae72 100755 (executable)
--- a/reindex_blog_ru
+++ b/reindex_blog_ru
@@ -5,5 +5,5 @@ umask 022
 LC_TIME=ru_RU.KOI8-R
 export LC_TIME
 
-cd ../htdocs/phd.pp.ru && \
-exec ../../phd.pp.ru/reindex_blog.py ../../phd.pp.ru/ru Russian/blog
+cd ../htdocs/phdru.name/public_html && \
+exec ../../../phdru.name/reindex_blog.py ../../../phdru.name/ru Russian/blog

diff --git a/rss_20.tmpl b/rss_20.tmpl
index 84149ba214b3ce09ccd543a4ed167e79dab8afc5..9719df8845d9d3dd34ea2a263bc3448bb476e60f 100644 (file)
--- a/rss_20.tmpl
+++ b/rss_20.tmpl
@@ -7,7 +7,7 @@
     <language>$lang</language>
     <webMaster>$author &lt;$email&gt;</webMaster>
     <lastBuildDate>${posts[0].rfc822_date}</lastBuildDate>
-    <generator>http://phd.pp.ru/about/make/${generator}.txt</generator>
+    <generator>http://phdru.name/about/make/${generator}.txt</generator>
 #for $post in $posts
     <item>
       <title>$post.title</title>

diff --git a/update-all b/update-all
index 67c24cd5f581619e1b1e9330a3212dfc88e14929..31b39d5195ebe675e38150ff398de788b2763b7b 100755 (executable)
--- a/update-all
+++ b/update-all
@@ -2,10 +2,10 @@
 
 cd ../htdocs && \
 
-ssh phdppru@phd.pp.ru "cd public_html && exec mv .htaccess awstats cgi-bin ../tmp" && \
-distribute -r public_html/ -d phd.pp.ru/ && \
-ssh phdppru@phd.pp.ru "cd tmp && exec mv .htaccess awstats cgi-bin ../public_html" && \
+ssh -4 phdppru@phdru.name 'cd public_html && exec mv .htaccess awstats cgi-bin "$HOME"/tmp' && \
+distribute -r public_html/ -d phdru.name/ && \
+ssh -4 phdppru@phdru.name "cd tmp && exec mv .htaccess awstats cgi-bin ../public_html" && \
 
-ssh iskra-aviel.phd.pp.ru sitecopy -u fatal.ru by.ru && \
-cd "$HOME" && rsync -avPz iskra-aviel.phd.pp.ru:.sitecopy . && \
+ssh -4 iskra-aviel.phdru.name sitecopy -u fatal.ru by.ru && \
+cd "$HOME" && rsync -avPz iskra-aviel.phdru.name:.sitecopy . && \
 exec distribute .sitecopy