nodeodm-proxy --> ClusterODM rename

pierotofy · pierotofy · commit dd0d58b7c0f3 · 2019-05-09T18:07:43.000-04:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# nodeodm-proxy
+# ClusterODM
 A reverse proxy, load balancer and task tracker for NodeODM
 
 ## Installation
diff --git a/admincli.js b/admincli.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/adminweb.js b/adminweb.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@ module.exports = {
             app.use(basicAuth({
                 users: { 'admin': options.password },
                 challenge: true,
-                realm: "nodeodm-proxy"
+                realm: "ClusterODM"
             }));
         }
         
diff --git a/config.js b/config.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -60,7 +60,7 @@ Options:
     --upload-max-speed <number>	Upload to processing nodes speed limit in bytes / second (default: no limit)
     --downloads-from-s3 <URL>	S3 URL prefix where to redirect /task/<uuid>/download requests. (default: do not use S3, forward download requests to nodes) 
     --no-cluster	By default the program will set itself as being a cluster node for all split/merge tasks. Setting this option disables it. (default: false)
-    --cluster-address <http(s)://host:port>	Should be set to a public URL that worker nodes can use to reach nodeodm-proxy for the purpose of allowing split/merge workflows. (default: match the "host" header from client's HTTP request)
+    --cluster-address <http(s)://host:port>	Should be set to a public URL that worker nodes can use to reach ClusterODM for the purpose of allowing split/merge workflows. (default: match the "host" header from client's HTTP request)
     --debug 	Disable caches and other settings to facilitate debug (default: false)
     --ssl-key <file>	Path to .pem SSL key file
     --ssl-cert <file>	Path to SSL .pem certificate
diff --git a/letsencrypt-autogen.sh b/letsencrypt-autogen.sh
@@ -14,8 +14,8 @@ if [ -z $DOMAIN ]; then
 	exit 1
 fi
 
-echo Stopping nodeodm-proxy services...
-systemctl stop "nodeodm-proxy*"
+echo Stopping ClusterODM services...
+systemctl stop "clusterodm*"
 
 # Generate/update certificate
 certbot certonly --work-dir ./letsencrypt --config-dir ./letsencrypt --logs-dir ./letsencrypt --standalone -d $DOMAIN --register-unsafely-without-email --agree-tos --keep
@@ -27,5 +27,5 @@ else
 	echo -e "\033[91mWARN: We couldn't automatically generate the SSL certificate. Review the console log. WebODM will likely be inaccessible.\033[39m"
 fi
 
-echo Starting nodeodm-proxy services...
-systemctl start "nodeodm-proxy*"
+echo Starting ClusterODM services...
+systemctl start "clusterodm*"
diff --git a/libs/classes/AbstractCloudProvider.js b/libs/classes/AbstractCloudProvider.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/classes/Node.js b/libs/classes/Node.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/classes/ValueCache.js b/libs/classes/ValueCache.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/cloudProvider.js b/libs/cloudProvider.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/logger.js b/libs/logger.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/nodes.js b/libs/nodes.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/odmOptions.js b/libs/odmOptions.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/providers/LightningCloudProvider.js b/libs/providers/LightningCloudProvider.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/providers/LightningDevCloudProvider.js b/libs/providers/LightningDevCloudProvider.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/providers/LocalCloudProvider.js b/libs/providers/LocalCloudProvider.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/proxy.js b/libs/proxy.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/routetable.js b/libs/routetable.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/statusCodes.js b/libs/statusCodes.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/taskNew.js b/libs/taskNew.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -123,7 +123,7 @@ module.exports = {
 
         if (!config.no_cluster){
             // We automatically set the "sm-cluster" parameter
-            // to match the address that was used to reach nodeodm-proxy.
+            // to match the address that was used to reach ClusterODM.
             // if "--split" is set.
             const addr = config.cluster_address ? 
                         config.cluster_address : 
diff --git a/libs/tasktable.js b/libs/tasktable.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/libs/utils.js b/libs/utils.js
@@ -1,5 +1,5 @@
 /**
- *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM
  *  Copyright (C) 2018-present MasseranoLabs LLC
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nodeodm-proxy",
+  "name": "ClusterODM",
   "version": "1.1.0",
   "description": "",
   "main": "index.js",
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/MasseranoLabs/nodeodm-proxy"
+    "url": "https://github.com/OpenDroneMap/ClusterODM"
   },
   "author": "",
   "license": "ISC",
diff --git a/services/clusterodm.service b/services/clusterodm.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Start nodeodm-proxy Service
+Description=Start ClusterODM Service
 
 [Service]
 Type=simple
-PIDFile=/run/nodeodm-proxy.pid
+PIDFile=/run/clusterodm.pid
 User=odm
 Group=odm
 WorkingDirectory=/www

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# nodeodm-proxy`
	`1`	`+# ClusterODM`
`2`	`2`	`A reverse proxy, load balancer and task tracker for NodeODM`
`3`	`3`
`4`	`4`	`## Installation`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM`
	`2`	`+ * ClusterODM - A reverse proxy, load balancer and task tracker for NodeODM`
`3`	`3`	`* Copyright (C) 2018-present MasseranoLabs LLC`
`4`	`4`	`*`
`5`	`5`	`* This program is free software: you can redistribute it and/or modify`