boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

removed www and welcome servlet, these had been demo servlets and are

Browse Source 
not needed any more
pull/1/head
Michael Peter Christen 10 years ago
parent 5247d01cd4
commit ca8b2bf099
3 changed files with 0 additions and 143 deletions
Show Stats Download Patch File Download Diff File

69
htroot/www/welcome.html
Unescape View File

@ -1,69 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
<title>YaCy: Default Page for Individual Peer Content</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Content-Language" content="English, Englisch">
<meta name="keywords" content="yacy individual html content">
<meta name="description" content="YaCy www default page">
<meta name="copyright" content="Michael Christen">
<link rel="stylesheet" media="all" href="../env/style.css">
<!-- (C), Architecture and Realisation: Michael Peter Christen; Contact: mc <at> anomic.de -->
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr><td>
<table class="Heading" border="0" cellspacing="0" cellpadding="0" width="100%">
<tr height="36">
<td width="240">
<a href="http://www.yacy.net">
<img width="52" height="33" border="0" src="../env/grafics/yacy.png" align="top" alt="YaCy-Logo">
</a>
</td>
<td width="50%" align="center">
<div class="Headline">Individual&nbsp;Web&nbsp;Page</div>
</td>
<td width="240" align="right">
<form action="http://#[peerdomain]#.yacy" method="post" accept-charset="UTF-8">
<input type="submit" value="#[peername]#'s Console" class="small" class="btn btn-primary">
</form>
</td>
</tr>
</table>
</td></tr>
</table>
<br /><br />
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
<td width="80"></td>
<td>
<h2>Welcome to your own web page<br />in the <strong>YaCy Network</strong>!</h2><br />
<p>
THIS IS A DEMONSTRATION PAGE FOR YOUR OWN INDIVIDUAL WEB SERVER!
PLEASE REPLACE THIS PAGE BY PUTTING A FILE index.html INTO THE PATH
&lt;YaCy-application-home&gt;<strong>#[wwwpath]#</strong>
</p>
<p>
This is peer '<strong>#[peername]#</strong>', running on host <strong>#[hostname]#</strong>.<br />
Your are accessing this page from the host '#[clientip]#'.<br />
<!--, IP <strong>#[hostip]#</strong>, port <strong>#[port]#</strong>-->
Every user of YaCy #[couldcan]# access this page
using the URL <a href="http://#[peeraddress]#/www/"><strong>http://#[peeraddress]#/www/</strong></a>
or <a href="http://www.#[peerdomain]#.yacy"><strong>http://www.#[peerdomain]#.yacy</strong></a> from within the YaCy network.</p>
<p>#[seniorinfo]#</p>
<p>We integrated an easy mechanism for web page authoring
which can also be used for simple file-sharing.
Please open the sample page <a href="http://share.#[peerdomain]#.yacy"><strong>http://share.#[peerdomain]#.yacy</strong></a>
and set upload/download accounts to author and access content on this peer.</p>
</td>
<td width="80"></td>
</tr></table>
</body>
</html>

71
htroot/www/welcome.java
Unescape View File

@ -1,71 +0,0 @@
package www;
// welcome.java
// -----------------------
// part of the AnomicHTTPD caching proxy
// (C) by Michael Peter Christen; mc@yacy.net
// first published on http://www.anomic.de
// Frankfurt, Germany, 2004
//
// $LastChangedDate$
// $LastChangedRevision$
// $LastChangedBy$
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// You must compile this file with
// javac -classpath .:../classes index.java
// if the shell's current path is HTROOT
import java.io.File;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.peers.Seed;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;
import net.yacy.server.serverObjects;
import net.yacy.server.serverSwitch;
public class welcome {
public static serverObjects respond(final RequestHeader header, @SuppressWarnings("unused") final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env;
// return variable that accumulates replacements
final serverObjects prop = new serverObjects();
// update seed info
sb.updateMySeed();
prop.putHTML("peername", sb.peers.mySeed().getName());
prop.putHTML("peerdomain", sb.peers.mySeed().getName().toLowerCase());
prop.putHTML("peeraddress", sb.peers.mySeed().getPublicAddress());
prop.put("hostname", env.myPublicIP());
prop.put("hostip", Domains.dnsResolve(env.myPublicIP()).getHostAddress());
prop.put("port", env.getConfig("port","8090"));
prop.put("clientip", header.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, ""));
final String peertype = (sb.peers.mySeed() == null) ? Seed.PEERTYPE_JUNIOR : sb.peers.mySeed().get(Seed.PEERTYPE, Seed.PEERTYPE_VIRGIN);
final boolean senior = (peertype.equals(Seed.PEERTYPE_SENIOR)) || (peertype.equals(Seed.PEERTYPE_PRINCIPAL));
if (senior) { prop.put("couldcan", "can"); } else { prop.put("couldcan", "could"); }
if (senior) { prop.put("seniorinfo", "This peer runs in senior mode which means that your peer can be accessed using the addresses shown above."); } else { prop.putHTML("seniorinfo", "<b>Nobody can access your peer from the outside of your intranet. You must open your firewall and/or set a 'virtual server' in the settings of your router to enable access to the addresses as shown below.</b>"); }
final File wwwpath = env.getDataPath(SwitchboardConstants.HTDOCS_PATH, SwitchboardConstants.HTDOCS_PATH_DEFAULT);
prop.putHTML("wwwpath", wwwpath.isAbsolute() ? wwwpath.getAbsolutePath() : "<application_root_path>/" + env.getConfig(SwitchboardConstants.HTDOCS_PATH, SwitchboardConstants.HTDOCS_PATH_DEFAULT));
// return rewrite properties
return prop;
}
}

3
source/net/yacy/yacy.java
Unescape View File

@ -265,9 +265,6 @@ public final class yacy {
System.out.println("Error creating htdocs readme: " + e.getMessage());
}
final File wwwDefaultPath = new File(htDocsPath, "www");
mkdirIfNeseccary(wwwDefaultPath);
final File shareDefaultPath = new File(htDocsPath, "share");
mkdirIfNeseccary(shareDefaultPath);

Write Preview
Loading…
Cancel
Save