summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapp.json4
-rw-r--r--defaults/yacy.init4
-rw-r--r--htroot/ConfigPortal_p.java2
-rw-r--r--htroot/Help.html14
-rw-r--r--htroot/api/feed.java2
-rw-r--r--htroot/env/templates/header.template4
-rw-r--r--htroot/env/templates/metas.template4
-rw-r--r--htroot/env/templates/simpleSearchHeader.template4
-rw-r--r--htroot/env/templates/simpleheader.template4
-rw-r--r--htroot/opensearchdescription.xml2
-rw-r--r--htroot/terminal_p.html2
11 files changed, 23 insertions, 23 deletions
diff --git a/app.json b/app.json
index 4a7a88875..660660261 100755
--- a/app.json
+++ b/app.json
@@ -8,9 +8,9 @@
"decentralized",
"java"
],
- "website": "http://yacy.net",
+ "website": "https://yacy.net",
"repository": "https://github.com/yacy/yacy_search_server",
- "logo": "http://yacy.net/material/YaCyLogo2011.svg",
+ "logo": "https://yacy.net/material/YaCyLogo2011.svg",
"env": {
"YACY_INIT_ADMIN_PASSWORD": {
"description": "Administrator initial password : please fill with a Base64 MD5 value",
diff --git a/defaults/yacy.init b/defaults/yacy.init
index ece7ba1cc..8f556d4ab 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -315,7 +315,7 @@ promoteSearchPageGreeting = Web Search by the People, for the People
# if the following property is set to true, the network name is used as greeting
promoteSearchPageGreeting.useNetworkName = false
# the following attributes can be used to define a custom image, alternative text and home page on the search page
-promoteSearchPageGreeting.homepage = http://yacy.net
+promoteSearchPageGreeting.homepage = https://yacy.net
promoteSearchPageGreeting.imageAlt = YaCy project web site
promoteSearchPageGreeting.largeImage = env/grafics/YaCyLogo_120ppi.png
promoteSearchPageGreeting.smallImage = env/grafics/YaCyLogo_60ppi.png
@@ -1222,7 +1222,7 @@ content.phpbb3.dumpfile =
about.headline=Please support YaCy!
about.body=<iframe src="env/donate.html" width="100%" height="90" border="0" frameborder="0" scrolling="no" hspace="0" vspace="0" name="donate"></iframe><br/><div style="padding:8px;">If you run a YaCy server, feel free to replace our donation plea with your own support message, use the <a href="ConfigPortal_p.html">Portal Configuration</a> servlet.</div>
-donation.iframesource=http://yacy.net/include/donate.html
+donation.iframesource=https://yacy.net/include/donate.html
donation.iframetarget=env/donate.html
# search heuristics
diff --git a/htroot/ConfigPortal_p.java b/htroot/ConfigPortal_p.java
index b69ab3c3c..7b6b96c6f 100644
--- a/htroot/ConfigPortal_p.java
+++ b/htroot/ConfigPortal_p.java
@@ -153,7 +153,7 @@ public class ConfigPortal_p {
}
}
sb.setConfig(SwitchboardConstants.GREETING, config.getProperty(SwitchboardConstants.GREETING,"P2P Web Search"));
- sb.setConfig(SwitchboardConstants.GREETING_HOMEPAGE, config.getProperty(SwitchboardConstants.GREETING_HOMEPAGE,"http://yacy.net"));
+ sb.setConfig(SwitchboardConstants.GREETING_HOMEPAGE, config.getProperty(SwitchboardConstants.GREETING_HOMEPAGE,"https://yacy.net"));
sb.setConfig(SwitchboardConstants.GREETING_LARGE_IMAGE, config.getProperty(SwitchboardConstants.GREETING_LARGE_IMAGE,"env/grafics/YaCyLogo_120ppi.png"));
sb.setConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, config.getProperty(SwitchboardConstants.GREETING_SMALL_IMAGE,"env/grafics/YaCyLogo_60ppi.png"));
sb.setConfig(SwitchboardConstants.GREETING_IMAGE_ALT, config.getProperty(SwitchboardConstants.GREETING_IMAGE_ALT,"YaCy project web site"));
diff --git a/htroot/Help.html b/htroot/Help.html
index c0d6eff2d..0fe2f0394 100644
--- a/htroot/Help.html
+++ b/htroot/Help.html
@@ -15,21 +15,21 @@
</p>
<h3><img src="env/grafics/flag_english_28x17.gif"> Demo from <a href="http://fscons.org/" target="_blank">FSCONS 2010</a>: Web Search By The People, For The People</a></h3>
-<iframe src="http://player.vimeo.com/video/32562148?portrait=0" width="720" height="540" frameborder="0"></iframe>
+<iframe src="https://player.vimeo.com/video/32562148?portrait=0" width="720" height="540" frameborder="0"></iframe>
<p>
-<a href="http://twitter.com/?status=FSCONS%202010:%20YaCy%20Demo%20http://vimeo.com/32562148%20%23YaCy" target="_blank">twitter this video</a>
-Download from Vimeo: <a href="http://vimeo.com/32562148" target="_blank">FSCONS 2010: YaCy Demo</a>
+<a href="http://twitter.com/?status=FSCONS%202010:%20YaCy%20Demo%20https://vimeo.com/32562148%20%23YaCy" target="_blank">twitter this video</a>
+Download from Vimeo: <a href="https://vimeo.com/32562148" target="_blank">FSCONS 2010: YaCy Demo</a>
</p>
<h3><img src="env/grafics/flag_deutsch_28x17.gif"> Demo von <a href="http://dgd.de/ProgrammOberhof2011.aspx" target="_blank">26. Oberhofer Kolloquium 2011</a>: Freier Wissenszugang mit der Suchmaschine YaCy</a></h3>
-<iframe src="http://player.vimeo.com/video/32200946?portrait=0" width="720" height="540" frameborder="0"></iframe>
+<iframe src="https://player.vimeo.com/video/32200946?portrait=0" width="720" height="540" frameborder="0"></iframe>
<p>
-<a href="http://twitter.com/?status=Freie%20Suchmaschine%20Demo%20http://vimeo.com/32200946%20%23YaCy" target="_blank">twitter this video</a>
-Download from Vimeo: <a href="http://vimeo.com/32200946" target="_blank">26. Oberhofer Kolloquium 2011: YaCy Demo</a>
+<a href="https://twitter.com/?status=Freie%20Suchmaschine%20Demo%20https://vimeo.com/32200946%20%23YaCy" target="_blank">twitter this video</a>
+Download from Vimeo: <a href="https://vimeo.com/32200946" target="_blank">26. Oberhofer Kolloquium 2011: YaCy Demo</a>
</p>
<h3>More Tutorials</h3>
- <p>Please see the tutorials on <a href="http://yacy.net" target="_blank">http://yacy.net</a></p>
+ <p>Please see the tutorials on <a href="https://yacy.net" target="_blank">https://yacy.net</a></p>
#%env/templates/footer.template%#
</body>
diff --git a/htroot/api/feed.java b/htroot/api/feed.java
index d14c5a2c4..1c853085d 100644
--- a/htroot/api/feed.java
+++ b/htroot/api/feed.java
@@ -49,7 +49,7 @@ public class feed {
prop.put("channel_pubDate", (new Date()).toString());
prop.putXML("item_" + messageCount + "_title", channelName + ": " + "YaCy Test Entry " + (new Date()).toString());
prop.putXML("item_" + messageCount + "_description", "abcdefg");
- prop.putXML("item_" + messageCount + "_link", "http://yacy.net");
+ prop.putXML("item_" + messageCount + "_link", "https://yacy.net");
prop.put("item_" + messageCount + "_pubDate", (new Date()).toString());
prop.put("item_" + messageCount + "_guid", System.currentTimeMillis());
messageCount++;
diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 2bed0e9de..6cb7cb7a4 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -107,10 +107,10 @@
<a href="#" data-toggle="dropdown" class="dropdown-toggle" aria-label="Help" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-question-sign"></span></a>
<ul class="dropdown-menu">
<li id="header_profile"><a href="ViewProfile.html?hash=localhash">About This Page</a></li>
- <li id="header_tutorial"><a href="http://yacy.net/tutorials/">YaCy Tutorials</a></li>
+ <li id="header_tutorial"><a href="https://yacy.net/tutorials/">YaCy Tutorials</a></li>
<li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li>
<li class="divider" role="separator"></li>
- <li id="header_download"><a href="http://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
+ <li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
<li id="header_community"><a href="http://forum.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li>
<li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li>
<li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li>
diff --git a/htroot/env/templates/metas.template b/htroot/env/templates/metas.template
index 30e62e4d9..db0405664 100644
--- a/htroot/env/templates/metas.template
+++ b/htroot/env/templates/metas.template
@@ -19,8 +19,8 @@
JavaScript code in this page.
Copyright (C) 2005-2016 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
-and other YaCy developers (see http://yacy.net/en/Join.html)
-first published 07.04.2005 on http://yacy.net
+and other YaCy developers (see https://yacy.net/en/Join.html)
+first published 07.04.2005 on https://yacy.net
The JavaScript code in this page is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/htroot/env/templates/simpleSearchHeader.template b/htroot/env/templates/simpleSearchHeader.template
index 90e25b2c5..761f6c7d2 100644
--- a/htroot/env/templates/simpleSearchHeader.template
+++ b/htroot/env/templates/simpleSearchHeader.template
@@ -58,10 +58,10 @@
<a href="#" data-toggle="dropdown" class="dropdown-toggle" aria-label="Help" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-question-sign"></span></a>
<ul class="dropdown-menu" role="menu">
<li id="header_profile"><a href="ViewProfile.html?hash=localhash">About This Page</a></li>
- <li id="header_tutorial"><a href="http://yacy.net/tutorials/">YaCy Tutorials</a></li>
+ <li id="header_tutorial"><a href="https://yacy.net/tutorials/">YaCy Tutorials</a></li>
<li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li>
<li class="divider" role="separator"></li>
- <li id="header_download"><a href="http://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
+ <li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
<li id="header_community"><a href="http://forum.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li>
<li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li>
<li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li>
diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template
index 634d03ad3..02a9a600d 100644
--- a/htroot/env/templates/simpleheader.template
+++ b/htroot/env/templates/simpleheader.template
@@ -38,10 +38,10 @@
<a href="#" data-toggle="dropdown" class="dropdown-toggle" aria-label="Help" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-question-sign"></span></a>
<ul class="dropdown-menu" role="menu">
<li id="header_profile"><a href="ViewProfile.html?hash=localhash">About This Page</a></li>
- <li id="header_tutorial"><a href="http://yacy.net/tutorials/">YaCy Tutorials</a></li>
+ <li id="header_tutorial"><a href="https://yacy.net/tutorials/">YaCy Tutorials</a></li>
<li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li>
<li class="divider" role="separator"></li>
- <li id="header_download"><a href="http://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
+ <li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
<li id="header_community"><a href="http://forum.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li>
<li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li>
<li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li>
diff --git a/htroot/opensearchdescription.xml b/htroot/opensearchdescription.xml
index 68026e59d..8c3359ec7 100644
--- a/htroot/opensearchdescription.xml
+++ b/htroot/opensearchdescription.xml
@@ -26,6 +26,6 @@
<Query role="example" searchTerms="yacy+free+software" />
<Tags>YaCy Free Software Open Source P2P Peer-to-Peer Uncensored Distributed Web Search Engine</Tags>
<Contact>See #[thisContext]#/ViewProfile.html?hash=localhash</Contact>
- <Attribution>http://yacy.net YaCy Software &amp;copy; 2004-2014 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
+ <Attribution>https://yacy.net YaCy Software &amp;copy; 2004-2018 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
<SyndicationRight>open</SyndicationRight>
</OpenSearchDescription>
diff --git a/htroot/terminal_p.html b/htroot/terminal_p.html
index 2042b39b0..d45806c76 100644
--- a/htroot/terminal_p.html
+++ b/htroot/terminal_p.html
@@ -40,7 +40,7 @@ function init() {
<div id="outer">
<div id="location">
-<a href="http://yacy.net"><img src="Banner.png?textcolor=ffffff&amp;bgcolor=000000&amp;bordercolor=aaaaaa" alt="YaCy" style="width:468px;height:60px;border-width:0px;vertical-align:bottom;" /></a>&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://yacy.net"><img src="Banner.png?textcolor=ffffff&amp;bgcolor=000000&amp;bordercolor=aaaaaa" alt="YaCy" style="width:468px;height:60px;border-width:0px;vertical-align:bottom;" /></a>&nbsp;&nbsp;&nbsp;&nbsp;
<a href="index.html">&lt;Search Form&gt;</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a href="CrawlStartSite.html">&lt;Crawl Start&gt;</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a href="Status.html">&lt;Status Page&gt;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;