- added new system update configuration page - moved system update from status page to system udate page - moved shutdown and restart from status page to main menu - added new configuration properties to yacy.init (not yet actively used) - added some methods to handle new automatic update process git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3958 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
orbiter
18 years ago
parent
4968556668
commit
527b3decde
@ -0,0 +1,47 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': System Update</title>
|
||||
#%env/templates/metas.template%#
|
||||
<meta http-equiv="REFRESH" content="30" />
|
||||
</head>
|
||||
<body style="margin:0px;">
|
||||
#%env/templates/header.template%#
|
||||
#%env/templates/submenuConfig.template%#
|
||||
<h2>System Update</h2>
|
||||
|
||||
#(candeploy)#::
|
||||
<fieldset>
|
||||
<legend>System Update</legend>
|
||||
<dl>
|
||||
<dt>Available Releases</dt>
|
||||
<dd><form action="ConfigUpdate_p.html" method="get">
|
||||
<select name="releasedownload">
|
||||
#{availreleases}#
|
||||
<option #(selected)#::selected#(/selected)# value="#[url]#">#[name]#</option>
|
||||
#{/availreleases}#
|
||||
</select>
|
||||
<button type="submit" name="downloadRelease" value="DownloadRelease">
|
||||
<img src="/env/grafics/lock.gif" alt="" />
|
||||
Download Release
|
||||
</button><br><br>
|
||||
</form></dd>
|
||||
<dt>Downloaded Releases</dt>
|
||||
<dd><form action="Steering.html" method="get">
|
||||
<select name="releaseinstall">
|
||||
#{downloadedreleases}#
|
||||
<option #(selected)#::selected#(/selected)# value="#[file]#">#[name]#</option>
|
||||
#{/downloadedreleases}#
|
||||
</select>#(deployenabled)#::no automated installation on development environments::
|
||||
<button type="submit" name="update" value="InstallRelease">
|
||||
<img src="/env/grafics/lock.gif" alt="" />
|
||||
Install Release
|
||||
</button>#(/deployenabled)#
|
||||
</form></dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
#(/candeploy)#
|
||||
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,156 @@
|
||||
// ConfigUpdate_p.java
|
||||
// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
|
||||
// first published 11.07.2007 on http://yacy.net
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
|
||||
// $LastChangedRevision: 1986 $
|
||||
// $LastChangedBy: orbiter $
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// 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
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.net.URL;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
import de.anomic.server.serverSystem;
|
||||
import de.anomic.yacy.yacyVersion;
|
||||
|
||||
public class ConfigUpdate_p {
|
||||
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
|
||||
// return variable that accumulates replacements
|
||||
final serverObjects prop = new serverObjects();
|
||||
final plasmaSwitchboard sb = (plasmaSwitchboard) env;
|
||||
|
||||
if (post != null) {
|
||||
if (post.containsKey("downloadRelease")) {
|
||||
// download a release
|
||||
String release = post.get("releasedownload", "");
|
||||
if (release.length() > 0) {
|
||||
try {
|
||||
yacyVersion.downloadRelease(new yacyVersion(new URL(release)));
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// version information
|
||||
String versionstring = yacy.combined2prettyVersion(sb.getConfig("version","0.1"));
|
||||
prop.put("versionpp", versionstring);
|
||||
boolean devenvironment = versionstring.startsWith("dev");
|
||||
double thisVersion = Double.parseDouble(sb.getConfig("version","0.1"));
|
||||
// cut off the SVN Rev in the Version
|
||||
try {thisVersion = Math.round(thisVersion*1000.0)/1000.0;} catch (NumberFormatException e) {}
|
||||
|
||||
if (serverSystem.canExecUnix) {
|
||||
// we can deploy a new system with (i.e.)
|
||||
// cd DATA/RELEASE;tar xfz $1;cp -Rf yacy/* ../../;rm -Rf yacy
|
||||
|
||||
// list downloaded releases
|
||||
yacyVersion release, dflt;
|
||||
String[] downloaded = sb.releasePath.list();
|
||||
prop.put("candeploy", 1);
|
||||
prop.put("candeploy_deployenabled", (downloaded.length == 0) ? 0 : ((devenvironment) ? 1 : 2)); // prevent that a developer-version is over-deployed
|
||||
|
||||
TreeSet downloadedreleases = new TreeSet();
|
||||
for (int j = 0; j < downloaded.length; j++) {
|
||||
try {
|
||||
release = (yacyVersion) new yacyVersion(downloaded[j]);
|
||||
downloadedreleases.add(release);
|
||||
} catch (RuntimeException e) {
|
||||
// not a valid release
|
||||
new File(sb.releasePath, downloaded[j]).deleteOnExit(); // can be also a restart- or deploy-file
|
||||
}
|
||||
}
|
||||
dflt = (downloadedreleases.size() == 0) ? null : (yacyVersion) downloadedreleases.last();
|
||||
Iterator i = downloadedreleases.iterator();
|
||||
int relcount = 0;
|
||||
while (i.hasNext()) {
|
||||
release = (yacyVersion) i.next();
|
||||
prop.put("candeploy_downloadedreleases_" + relcount + "_name", (release.proRelease ? "pro" : "standard") + "/" + ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
|
||||
prop.put("candeploy_downloadedreleases_" + relcount + "_file", release.name);
|
||||
prop.put("candeploy_downloadedreleases_" + relcount + "_selected", (release == dflt) ? 1 : 0);
|
||||
relcount++;
|
||||
}
|
||||
prop.put("candeploy_downloadedreleases", relcount);
|
||||
|
||||
// list remotely available releases
|
||||
TreeSet[] releasess = yacyVersion.allReleases(false); // {0=promain, 1=prodev, 2=stdmain, 3=stddev}
|
||||
relcount = 0;
|
||||
// main
|
||||
TreeSet releases = releasess[(yacy.pro) ? 0 : 2];
|
||||
releases.removeAll(downloadedreleases);
|
||||
i = releases.iterator();
|
||||
while (i.hasNext()) {
|
||||
release = (yacyVersion) i.next();
|
||||
prop.put("candeploy_availreleases_" + relcount + "_name", (release.proRelease ? "pro" : "standard") + "/" + ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
|
||||
prop.put("candeploy_availreleases_" + relcount + "_url", release.url.toString());
|
||||
prop.put("candeploy_availreleases_" + relcount + "_selected", 0);
|
||||
relcount++;
|
||||
}
|
||||
// dev
|
||||
dflt = (releasess[(yacy.pro) ? 1 : 3].size() == 0) ? null : (yacyVersion) releasess[(yacy.pro) ? 1 : 3].last();
|
||||
releases = releasess[(yacy.pro) ? 1 : 3];
|
||||
releases.removeAll(downloadedreleases);
|
||||
i = releases.iterator();
|
||||
while (i.hasNext()) {
|
||||
release = (yacyVersion) i.next();
|
||||
prop.put("candeploy_availreleases_" + relcount + "_name", (release.proRelease ? "pro" : "standard") + "/" + ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
|
||||
prop.put("candeploy_availreleases_" + relcount + "_url", release.url.toString());
|
||||
prop.put("candeploy_availreleases_" + relcount + "_selected", (release == dflt) ? 1 : 0);
|
||||
relcount++;
|
||||
}
|
||||
prop.put("candeploy_availreleases", relcount);
|
||||
} else {
|
||||
prop.put("candeploy", 0);
|
||||
}
|
||||
|
||||
/*
|
||||
if ((adminaccess) && (yacyVersion.latestRelease >= (thisVersion+0.01))) { // only new Versions(not new SVN)
|
||||
if ((yacyVersion.latestMainRelease != null) ||
|
||||
(yacyVersion.latestDevRelease != null)) {
|
||||
prop.put("hintVersionDownload", 1);
|
||||
} else if ((post != null) && (post.containsKey("aquirerelease"))) {
|
||||
yacyVersion.aquireLatestReleaseInfo();
|
||||
prop.put("hintVersionDownload", 1);
|
||||
} else {
|
||||
prop.put("hintVersionAvailable", 1);
|
||||
}
|
||||
}
|
||||
prop.put("hintVersionAvailable", 1); // for testing
|
||||
|
||||
prop.putASIS("hintVersionDownload_versionResMain", (yacyVersion.latestMainRelease == null) ? "-" : yacyVersion.latestMainRelease.toAnchor());
|
||||
prop.putASIS("hintVersionDownload_versionResDev", (yacyVersion.latestDevRelease == null) ? "-" : yacyVersion.latestDevRelease.toAnchor());
|
||||
prop.put("hintVersionAvailable_latestVersion", Double.toString(yacyVersion.latestRelease));
|
||||
*/
|
||||
|
||||
return prop;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,12 +1,27 @@
|
||||
<div class="SubMenu">
|
||||
<h3>Peer Configuration Menu</h3>
|
||||
<h3>Peer Administration Console</h3>
|
||||
<ul class="SubMenu">
|
||||
<li><a href="/ConfigBasic.html" class="MenuItemLink lock">Basic Configuraton</a></li>
|
||||
<li><a href="/Status.html" class="MenuItemLink lock">Status</a></li>
|
||||
<li><a href="/ConfigBasic.html" class="MenuItemLink lock">Access Config</a></li>
|
||||
<li><a href="/ConfigLanguage_p.html" class="MenuItemLink lock">Language</a></li>
|
||||
<li><a href="/ConfigProfile_p.html" class="MenuItemLink lock">Profile</a></li>
|
||||
<li><a href="/ConfigSkins_p.html" class="MenuItemLink lock">Skins</a></li>
|
||||
<li><a href="/ConfigUpdate_p.html" class="MenuItemLink lock">System Update</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="SubMenu">
|
||||
<ul class="SubMenu">
|
||||
<li><a href="/ConfigNetwork_p.html" class="MenuItemLink lock">Network</a></li>
|
||||
<li><a href="/ConfigProfile_p.html" class="MenuItemLink lock">Peer Profile</a></li>
|
||||
<li><a href="/ConfigSkins_p.html" class="MenuItemLink lock">Interface Skins</a></li>
|
||||
<li><a href="/ConfigRobotsTxt_p.html" class ="MenuItemLink lock">Local robots.txt</a></li>
|
||||
<li><a href="/ConfigAdvanced_p.html" class="MenuItemLink lock">Advanced</a></li>
|
||||
<li><a href="/User_p.html" class="MenuItemLink lock">User Administration</a></li>
|
||||
<li><a href="/Settings_p.html" class="MenuItemLink lock">Advanced Settings</a></li>
|
||||
<li><a href="/ConfigProperties_p.html" class="MenuItemLink lock">Advanced Properties</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="SubMenu">
|
||||
<ul class="SubMenu">
|
||||
<li><a href="/PerformanceQueues_p.html" class="MenuItemLink lock">Queues Performance Settings</a></li>
|
||||
<li><a href="/PerformanceMemory_p.html" class="MenuItemLink lock">Memory Settings for Database Caches</a></li>
|
||||
<li><a href="/PerformanceSearch_p.html" class="MenuItemLink lock">Timing Settings for Search Sequence</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -1,8 +0,0 @@
|
||||
<div class="SubMenu">
|
||||
<h3>Performance Menu</h3>
|
||||
<ul class="SubMenu">
|
||||
<li><a href="/PerformanceQueues_p.html" class="MenuItemLink lock">Queues Performance Settings</a></li>
|
||||
<li><a href="/PerformanceMemory_p.html" class="MenuItemLink lock">Memory Settings for Database Caches</a></li>
|
||||
<li><a href="/PerformanceSearch_p.html" class="MenuItemLink lock">Timing Settings for Search Sequence</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
Loading…
Reference in new issue