Upgrade: http://phdru.name/ -> https://phdru.name/

diff --git a/README.html b/README.html
index 96f5f0b590b1edf7b7fd0537e8fcb1b12766f801..bb8447e293c31577c450561c77132f279b77ec1d 100644 (file)
--- a/README.html
+++ b/README.html
@@ -1,2 +1,2 @@
-<a href="http://phdru.name/about/technical.html">phdru.name</a> -
+<a href="https://phdru.name/about/technical.html">phdru.name</a> -
 scripts I use to manage phdru.name.

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

diff --git a/make-news.py b/make-news.py
index 6d6ab7db65019cad6b08ad5de80989704958f8aa..35cf42d25cbf697f7087064454e384f1371d46e0 100755 (executable)
--- a/make-news.py
+++ b/make-news.py
@@ -57,7 +57,7 @@ write_if_changed(os.path.join(root, "news.tmpl"), ''.join(new_text))
 
 namespace = {
     "title": "Oleg Broytman's Personal Page - News",
-    "baseURL": "http://phdru.name/",
+    "baseURL": "https://phdru.name/",
     "indexFile": "news.html",
     "description": "",
     "lang": lang,
@@ -69,7 +69,7 @@ namespace = {
 
 if lang == "ru":
     namespace["title"] = "Oleg Broytman's Personal Page - Russian News"
-    namespace["baseURL"] = baseURL = "http://phdru.name/Russian/"
+    namespace["baseURL"] = baseURL = "https://phdru.name/Russian/"
     for item in news_items:
         item.baseURL = baseURL
         if isinstance(item.title, bytes):

diff --git a/news.py b/news.py
index 82c5c1006dfb291577ae7fe384bf4eedfd0a46dc..4f62778fc81f248f1a923d72402ecbd2bfe2dd73 100644 (file)
--- a/news.py
+++ b/news.py
@@ -23,7 +23,7 @@ except NameError:  # PY3
         return std_open(fname, mode, encoding='koi8-r')
 
 class NewsItem(object):
-    baseURL = "http://phdru.name/"
+    baseURL = "https://phdru.name/"
     excerpt = None
     content = None
     categoryList = []

diff --git a/phd_site.tmpl b/phd_site.tmpl
index 9f6422d2f4c758805c005f467b40d3722c98fb3f..0568b49090046382724192633240900f9d3feee3 100644 (file)
--- a/phd_site.tmpl
+++ b/phd_site.tmpl
@@ -27,7 +27,7 @@
 #else
 <meta HTTP-Equiv="Content-Type" content="text/html">
 #end if
-<meta HTTP-Equiv="Content-Location" content="http://phdru.name$path">
+<meta HTTP-Equiv="Content-Location" content="https://phdru.name$path">
 <meta HTTP-Equiv="Last-Modified" content="$last_modified_en">
 <title>$Title</title>
 #if $Refresh:
@@ -53,7 +53,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 rel="canonical" href="http://phdru.name$path">
+<link rel="canonical" href="https://phdru.name$path">
 <link rev="made" href="mailto:phd@phdru.name">
 <meta name="generator" content="CheetahTemplate">
 <meta name="robots" content="index, follow">
@@ -100,10 +100,10 @@ $style
 #end if
 <link rel="shortcut icon" href="${root}favicon.ico">
 #if not $root and $path.endswith('index.html')
-<link rel="openid.delegate" href="http://phdru.name/">
-<link rel="openid2.local_id" href="http://phdru.name/">
-<link rel="openid.server" href="http://home.phdru.name/cgi-bin/poit.py">
-<link rel="openid2.provider" href="http://home.phdru.name/cgi-bin/poit.py">
+<link rel="openid.delegate" href="https://phdru.name/">
+<link rel="openid2.local_id" href="https://phdru.name/">
+<link rel="openid.server" href="https://home.phdru.name/cgi-bin/poit.py">
+<link rel="openid2.provider" href="https://home.phdru.name/cgi-bin/poit.py">
 #end if
 <meta name="MSSmartTagsPreventParsing" content="TRUE"> <!-- MUST DIE -->
 </head>
@@ -174,14 +174,14 @@ $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://phdru.name$path">http://phdru.name$path</a>
+<p class="head" style="font-size: 60%">Эта страница <a href="https://phdru.name$path">https://phdru.name$path</a>
 была сгенерирована $time.strftime("%d.%m.%Y", $local_time) в $time.strftime("%T", $local_time) из шаблона 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://phdru.name$path">http://phdru.name$path</a>.
+<p class="head" style="font-size: 60%">This is the page <a href="https://phdru.name$path">https://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 ab257d55848b0cfadd9b782752365c0dda5f902a..291e182eee8ddffff655114f347e50b9da54b97a 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -527,9 +527,9 @@ from news import NewsItem
 if blog_root:
    blog_root_url = blog_root[
         blog_root.find('/htdocs/phdru.name/') + len('/htdocs/phdru.name/'):]
-   baseURL = "http://phdru.name/%s/" % blog_root_url
+   baseURL = "https://phdru.name/%s/" % blog_root_url
 else:
-   baseURL = "http://phdru.name/"
+   baseURL = "https://phdru.name/"
 
 items = []
 for item in tuple(reversed(all_titles_tags))[:10]:

diff --git a/rss_20.tmpl b/rss_20.tmpl
index 9719df8845d9d3dd34ea2a263bc3448bb476e60f..0f22a6d2a2817ec44005d34f872825bba91bbafd 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://phdru.name/about/make/${generator}.txt</generator>
+    <generator>https://phdru.name/about/make/${generator}.txt</generator>
 #for $post in $posts
     <item>
       <title>$post.title</title>

diff --git a/sitemaps/phdru.name-config.xml b/sitemaps/phdru.name-config.xml
index c2e98c3a8dc13fff0ac735b9a358d77bbd19d03a..d47517ccdd95add54142f8415222372106bb644d 100644 (file)
--- a/sitemaps/phdru.name-config.xml
+++ b/sitemaps/phdru.name-config.xml
@@ -4,7 +4,7 @@
 -->
 
  <site
-  base_url="http://phdru.name/"
+  base_url="https://phdru.name/"
   store_into="/home/phd/Internet/WWW/htdocs/phdru.name/sitemap.xml"
   default_encoding="koi8-r"
   verbose="1"
@@ -13,7 +13,7 @@
  >
 
   <directory
-     url="http://phdru.name/"
+     url="https://phdru.name/"
      path="/home/phd/Internet/WWW/htdocs/phdru.name"
      default_file="index.html"
   />