minor updates

2 files changed, 54 insertions, 53 deletions

diff --git a/backend/freesitemgr/Standing With Resilience Public b/backend/freesitemgr/Standing With Resilience Public
index 7605bd4..92c4c7f 100644
--- a/backend/freesitemgr/Standing With Resilience Public
+++ b/backend/freesitemgr/Standing With Resilience Public
@@ -5,8 +5,8 @@
 
 name = "Standing With Resilience Public"
 dir = "../html"
-uriPriv = "USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing With Resilience Public/2"
-uriPub = "USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing With Resilience Public/2/"
+uriPriv = "USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing With Resilience Public/5"
+uriPub = "USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing With Resilience Public/5/"
 updateInProgress = True
 insertingManifest = True
 insertingIndex = False
@@ -18,10 +18,10 @@ mtype = "text/html"
 files = [
   {
     "mimetype": "text/html", 
-    "hash": "59573b43cbbbe0a983721a7be56c0444ec284a7a", 
+    "hash": "5cdfef47f51c5342ac4ad6f40750ce68073feac7", 
     "name": "Freenet/index.html", 
     "uri": "", 
-    "sizebytes": 1840, 
+    "sizebytes": 2528, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/Freenet/index.html", 
     "dda": true, 
@@ -30,10 +30,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "6fce83078313e60eb00919035589f48d7d2f819b", 
+    "hash": "2e95c9e421f2f02724d7dc1b11a79bcd9dc6553a", 
     "name": "Shielding/index.html", 
     "uri": "", 
-    "sizebytes": 6061, 
+    "sizebytes": 6115, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/Shielding/index.html", 
     "dda": true, 
@@ -42,10 +42,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "62361787298b6402c7d396482ba4bc8d8930f165", 
+    "hash": "787ae2089bf98addf7bae3bfda86adb0f5fc5c20", 
     "name": "TODO/index.html", 
     "uri": "", 
-    "sizebytes": 1751, 
+    "sizebytes": 1385, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/TODO/index.html", 
     "dda": true, 
@@ -54,10 +54,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "712e8e1c871c49009b6107eb1debfbca99d6538e", 
+    "hash": "bc4c198b805f15403fe4680f768942e578952552", 
     "name": "Tech_Savvy/index.html", 
     "uri": "", 
-    "sizebytes": 1297, 
+    "sizebytes": 1351, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/Tech_Savvy/index.html", 
     "dda": true, 
@@ -66,10 +66,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "728d9e7d07612602d4045ea7d5d36b07bc829cb8", 
+    "hash": "4f430ff6ba065b308eedd854e68202d39e6b4cce", 
     "name": "Technical_Resources/index.html", 
     "uri": "", 
-    "sizebytes": 1247, 
+    "sizebytes": 1301, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/Technical_Resources/index.html", 
     "dda": true, 
@@ -90,10 +90,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "72fcf44124c707a739819b5babf2b99ab8b45c79", 
+    "hash": "a52f263074f721782dd4f156ba60476cecdaf15e", 
     "name": "ikiwiki/directive/index.html", 
     "uri": "", 
-    "sizebytes": 3236, 
+    "sizebytes": 3290, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/directive/index.html", 
     "dda": true, 
@@ -102,10 +102,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "87481c60d56af1eeca90e4de915ef19871ec40d0", 
+    "hash": "1dee7e4fe7fb96e78b5d29dd5ab0e6007b3e0f14", 
     "name": "ikiwiki/formatting/index.html", 
     "uri": "", 
-    "sizebytes": 3485, 
+    "sizebytes": 3539, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/formatting/index.html", 
     "dda": true, 
@@ -114,10 +114,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "cb274881fdab89c63b56010fb8b870a918c84673", 
+    "hash": "f4d034a4e642fe5052f05b82ba43e0e160db305e", 
     "name": "ikiwiki/index.html", 
     "uri": "", 
-    "sizebytes": 1653, 
+    "sizebytes": 1707, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/index.html", 
     "dda": true, 
@@ -138,10 +138,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "b0a2dca6beacca6ecc2205f90c060e68d36fbd99", 
+    "hash": "3f77190fadf80f13b41698b127c4a78cdc9cc1d4", 
     "name": "ikiwiki/markdown/index.html", 
     "uri": "", 
-    "sizebytes": 1787, 
+    "sizebytes": 1841, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/markdown/index.html", 
     "dda": true, 
@@ -198,10 +198,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "3fe9f6d548dd23a0bf6f65ff3f61aaf614751540", 
+    "hash": "4b08a31f68519ef1fbfb91df4f8b5e0f94ffbc3e", 
     "name": "ikiwiki/openid/index.html", 
     "uri": "", 
-    "sizebytes": 2069, 
+    "sizebytes": 2123, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/openid/index.html", 
     "dda": true, 
@@ -258,10 +258,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "bcaf7317877bd5cab97fe678090e921686e898bc", 
+    "hash": "d8f55af83af3aeed0961cd3d68500dd1ca6b6614", 
     "name": "ikiwiki/pagespec/attachment/index.html", 
     "uri": "", 
-    "sizebytes": 2863, 
+    "sizebytes": 2917, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/pagespec/attachment/index.html", 
     "dda": true, 
@@ -270,10 +270,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "56c000d2e93e11929983845aed2d05bc9e5ac22b", 
+    "hash": "de5a703a667c47265ffa77bb685cf728cc56fb87", 
     "name": "ikiwiki/pagespec/index.html", 
     "uri": "", 
-    "sizebytes": 6025, 
+    "sizebytes": 6079, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/pagespec/index.html", 
     "dda": true, 
@@ -282,10 +282,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "3bcd9894f3057947b3cb47d52f986c8f305b4708", 
+    "hash": "44b8439bc499f9f059e1b35fe7e42072d04dbaf9", 
     "name": "ikiwiki/pagespec/po/index.html", 
     "uri": "", 
-    "sizebytes": 2102, 
+    "sizebytes": 2156, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/pagespec/po/index.html", 
     "dda": true, 
@@ -294,10 +294,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "8578ca621f7df168737037463a92839993070b59", 
+    "hash": "978d9743e24419b68ea474db93ba09cb1ad00014", 
     "name": "ikiwiki/pagespec/sorting/index.html", 
     "uri": "", 
-    "sizebytes": 2249, 
+    "sizebytes": 2303, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/pagespec/sorting/index.html", 
     "dda": true, 
@@ -306,10 +306,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "625c5e820c243e6ef3827ba29753ed1865a633e7", 
+    "hash": "f4f91fe3f6f9151d6c64b0dd7e6a13030ef47046", 
     "name": "ikiwiki/searching/index.html", 
     "uri": "", 
-    "sizebytes": 2041, 
+    "sizebytes": 2095, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/searching/index.html", 
     "dda": true, 
@@ -318,10 +318,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "d9e483bff38efcb42d63354b38a59cc08a00ed01", 
+    "hash": "9e29b6639d971bab8fc9164362f5d189a372abf3", 
     "name": "ikiwiki/subpage/index.html", 
     "uri": "", 
-    "sizebytes": 1964, 
+    "sizebytes": 2018, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/subpage/index.html", 
     "dda": true, 
@@ -330,10 +330,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "da18b5a5fce31011f5de59d3145601bd4df6ca99", 
+    "hash": "ff0698c45327ff98dc6be79e10de7d771620a34a", 
     "name": "ikiwiki/subpage/linkingrules/index.html", 
     "uri": "", 
-    "sizebytes": 3056, 
+    "sizebytes": 3110, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/subpage/linkingrules/index.html", 
     "dda": true, 
@@ -342,10 +342,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "e64bc1e931764788d379dc50a3bc1979a255fe34", 
+    "hash": "a96dfbe3c51c7589d5eca6c664180e5f8b111a5f", 
     "name": "ikiwiki/wikilink/index.html", 
     "uri": "", 
-    "sizebytes": 2725, 
+    "sizebytes": 2779, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/ikiwiki/wikilink/index.html", 
     "dda": true, 
@@ -354,10 +354,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "5aa4fad3105b61f5d7e4f29abcf0a8f9e78cb8d9", 
+    "hash": "049b8e88e0037e2daee08f01ee7739f909dca955", 
     "name": "index.html", 
     "uri": "CHK@Df82KVE2jZFntgB~bLWgSpZPqvbf1cyYZyHqWlwWryY,mJshNq8d-2L6J9yG0P3bJgU~6vBVeoxg-bZLbk1v~tU,AAMC--8/index.html", 
-    "sizebytes": 1736, 
+    "sizebytes": 1817, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/index.html", 
     "dda": true, 
@@ -378,10 +378,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "ab8f354e34a54452c10262b2f2e9a651af3da9f3", 
+    "hash": "2cb5ded46fdf48786afda40e04c6a89ff0f7b58f", 
     "name": "recentchanges/index.html", 
     "uri": "", 
-    "sizebytes": 1078, 
+    "sizebytes": 1132, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/recentchanges/index.html", 
     "dda": true, 
@@ -390,10 +390,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "248d20cf562374596d1d5159abdafac26cdfe8b5", 
+    "hash": "a63cc508643172235552675636c246b424b0ddf4", 
     "name": "sandbox/index.html", 
     "uri": "", 
-    "sizebytes": 1734, 
+    "sizebytes": 1788, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/sandbox/index.html", 
     "dda": true, 
@@ -402,10 +402,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "71bcd2fbb8d7c5f9f081c14af63209a407399751", 
+    "hash": "f3f2194384014a027973dd2508b3248cefa73e47", 
     "name": "shortcuts/index.html", 
     "uri": "", 
-    "sizebytes": 7283, 
+    "sizebytes": 7337, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/shortcuts/index.html", 
     "dda": true, 
@@ -426,10 +426,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "ab57403e2e8513305220c83e0832c15fe3058fca", 
+    "hash": "74854fda90d808ffef6542aa1be4f03d4924ffc7", 
     "name": "templates/index.html", 
     "uri": "", 
-    "sizebytes": 5527, 
+    "sizebytes": 5581, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/templates/index.html", 
     "dda": true, 
@@ -438,10 +438,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "e1d5ccbe1fd42af8ac0c5b6d209552fa3c3a5fec", 
+    "hash": "469975e8cf573e0bf02983ccb5f3863b1cbf79b6", 
     "name": "templates/note/index.html", 
     "uri": "", 
-    "sizebytes": 1288, 
+    "sizebytes": 1342, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/templates/note/index.html", 
     "dda": true, 
@@ -450,10 +450,10 @@ files = [
   }, 
   {
     "mimetype": "text/html", 
-    "hash": "cd43e30d538949b21b3f11a15e9ec423b3b7e843", 
+    "hash": "496bd9b6cea66621de88c628853ef566a1e85927", 
     "name": "templates/popup/index.html", 
     "uri": "", 
-    "sizebytes": 1673, 
+    "sizebytes": 1727, 
     "state": "idle", 
     "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/templates/popup/index.html", 
     "dda": true, 
diff --git a/backend/update.py b/backend/update.py
index 41abc0c..0af3898 100755
--- a/backend/update.py
+++ b/backend/update.py
@@ -11,6 +11,7 @@ if not found_git:
 found_ikiwiki = (os.system("ikiwiki --version") == 0)
 found_gitocalypse = (os.system("git-remote-freenet") == 256)
 found_freesitemgr = (os.system("freesitemgr --version") == 0)
+found_zeronetdir = 'ZERONETDIR' in os.environ
 
 if not found_ikiwiki:
   print("WARNING: ikiwiki not found, pages will not be built")
@@ -75,7 +76,7 @@ if status != 0:
 
 if found_freesitemgr:
   print (":: Publishing freesite ...")
-  status += os.system("freesitemgr -c freesitemgr -v -l freesitemgr.log -r 0 update")
+  status += os.system("freesitemgr -c freesitemgr -v -l freesitemgr.log -r 1 update")
 
 print "Done."