Update version of agents to 1.0.0; Update Insertion Authority request…

… key
censorship-no-archive · Mar 30, 2016 · 9f40dec · 9f40dec
1 parent 8c6b473
commit 9f40dec
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/ceno-box/build.sh b/ceno-box/build.sh
@@ -29,7 +29,7 @@ do
       PLUGINS=1
       ;;
     m)
-      PLATFORMS=(darwin_amd64)
+      PLATFORMS=(darwin_amd64 windows_386)
   esac
 done
 

diff --git a/ceno-box/ceno-extra/.CENO/client.properties b/ceno-box/ceno-extra/.CENO/client.properties
@@ -1,2 +1,2 @@
-bridgeKey=SSK@C7VZ~Ar87EKQDg7XhU2BrL8wY1Bo0cWXu3t5ODteUxQ,B6Z~AjwbM5GXusyZdjRsonnFL4KgLu4-e4SdfQwpAls,AQACAAE/
-feedsLastVersion=57
+bridgeKey=SSK@skyVcFU3qUK7lM-Ye2SGUwG1kQi1GPnI7tuiHttIOJA,d0aDf-qB~x7q7amxT935Kgju0Nw6TVfiIjZnPptmAF8,AQACAAE/
+feedsLastVersion=0
diff --git a/ceno-client/portal/html/about.html b/ceno-client/portal/html/about.html
@@ -29,7 +29,7 @@ <h2 id="aboutHeader5" class="directionToggles"></h2>
         <p id="aboutParagraph5" class="directionToggles"></p>
         <a href="https://equalit.ie">eQualit.ie</a>
         <a href="https://equalit.ie"><img src="/cenoresources/images/logo_eq.png" /></a>
-        <p><h3>CENO version 1.0.0-beta</h3></p>
+        <p><h3>CENO version 1.0.0</h3></p>
     </div>
     {{template "SCRIPTS" . }}
     <script src="/cenoresources/javascript/about.js"></script>

diff --git a/ceno-client/src/portal.go b/ceno-client/src/portal.go
@@ -294,10 +294,10 @@ func PortalArticlesHandler(w http.ResponseWriter, r *http.Request) {
 				})
 			}
 		} else if err != nil {
-				HandleCCError(ERR_NO_ARTICLES_FILE, T("no_articles_file_err"), ErrorState{
-					"responseWriter": w,
-					"request":        r,
-				})
+			HandleCCError(ERR_NO_ARTICLES_FILE, T("no_articles_file_err"), ErrorState{
+				"responseWriter": w,
+				"request":        r,
+			})
 		} else {
 			pleaseWait(r.URL.Path, w)
 		}

diff --git a/ceno-freenet/src/plugins/CENO/Client/CENOClient.java b/ceno-freenet/src/plugins/CENO/Client/CENOClient.java
@@ -22,7 +22,7 @@
 
 /**
  * CENO Client plugin
- * 
+ *
  * Implements the Local Cache Server (LCS) and Request Sender (RS)
  * CENO agents.
  */
@@ -45,7 +45,7 @@ public class CENOClient implements FredPlugin, FredPluginVersioned, FredPluginRe
 	private Thread channelMakerThread;
 
 	// Default bridge key (for the CENO bridge running on Deflect)
-	private static final String BRIDGE_KEY = "SSK@C7VZ~Ar87EKQDg7XhU2BrL8wY1Bo0cWXu3t5ODteUxQ,B6Z~AjwbM5GXusyZdjRsonnFL4KgLu4-e4SdfQwpAls,AQACAAE/";
+	private static final String BRIDGE_KEY = "SSK@skyVcFU3qUK7lM-Ye2SGUwG1kQi1GPnI7tuiHttIOJA,d0aDf-qB~x7q7amxT935Kgju0Nw6TVfiIjZnPptmAF8,AQACAAE/";
 
 	private static Long feedsLastVersion;
 
@@ -123,11 +123,11 @@ public long getRealVersion() {
 	public static String getBridgeKey() {
 		return bridgeKey;
 	}
-	
+
 	public static Long getFeedsLastVersion() {
 		return feedsLastVersion;
 	}
-	
+
 	static void setFeedsLastVersion(Long feedsLastVersionPar) {
 		feedsLastVersion = feedsLastVersionPar;
 	}

diff --git a/ceno-freenet/src/plugins/CENO/Version.java b/ceno-freenet/src/plugins/CENO/Version.java
@@ -6,14 +6,14 @@
 public class Version implements FredPluginVersioned, FredPluginRealVersioned {
 
 	// Versions of the plugins, in human-readable and "real" format
-	public static final String CLIENT_VERSION = "1.0.0-beta";
-	public static final int CLIENT_REAL_VERSION = 14;
+	public static final String CLIENT_VERSION = "1.0.0";
+	public static final int CLIENT_REAL_VERSION = 15;
 
-	public static final String BRIDGE_VERSION = "1.0.0-beta";
-	public static final int BRIDGE_REAL_VERSION = 14;
+	public static final String BRIDGE_VERSION = "1.0.0";
+	public static final int BRIDGE_REAL_VERSION = 15;
 
-	public static final String BACKBONE_VERSION = "1.0.0-beta";
-	public static final int BACKBONE_REAL_VERSION = 14;
+	public static final String BACKBONE_VERSION = "1.0.0";
+	public static final int BACKBONE_REAL_VERSION = 15;
 
 	/** Revision number of Version.java as read from CVS */
 	public static final String cvsRevision = "@custom@";