Merge pull request #7657 from sagemathinc/rename-cocalc-cloud

williamstein · web-flow · commit ab1f3c0edd50 · 2024-07-04T08:00:46.000-07:00
rename "CoCalc Cloud" → "CoCalc OnPrem"
diff --git a/src/packages/database/postgres/site-license/hook.ts b/src/packages/database/postgres/site-license/hook.ts
@@ -406,7 +406,7 @@ class SiteLicenseHook {
     if (quota == null) return true;
     // there are some exceptions. dedicated disks do work under PAYGO.
     const hasDisk = quota.get("dedicated_disk") != null;
-    // ext_rw and patch are for Cocalc Cloud, adding them just in case...
+    // ext_rw and patch are for CoCalc OnPrem, adding them just in case...
     const hasExtRW = quota.get("ext_rw") === true;
     const hasPatch = quota.get("patch") != null;
     if (hasDisk || hasExtRW || hasPatch) return false;
diff --git a/src/packages/database/postgres/site-license/quota-site-settings.ts b/src/packages/database/postgres/site-license/quota-site-settings.ts
@@ -11,7 +11,7 @@ export async function getQuotaSiteSettings(): Promise<
   SiteSettingsQuotas | undefined
 > {
   const allSettings = await getServerSettings();
-  // default_quotas and max_upgrades only play a role for cocalc-cloud
+  // default_quotas and max_upgrades only play a role for cocalc-onprem
   // it's fine to pass down "undefined" to the quota calculation function
   if (allSettings.kucalc === KUCALC_ON_PREMISES) {
     return {
diff --git a/src/packages/frontend/compute/onprem-config.tsx b/src/packages/frontend/compute/onprem-config.tsx
@@ -106,8 +106,8 @@ export default function OnPremCloudConfiguration({
           </li>
           <li>On-Prem compute servers are currently free.</li>
           <li>
-            <A href="https://doc-cloud.cocalc.com/overview.html">
-              CoCalc-Cloud
+            <A href="https://onprem.cocalc.com/overview.html">
+              CoCalc-OnPrem
             </A>{" "}
             is a related on-prem product for running a self-contained CoCalc
             cluster.
diff --git a/src/packages/frontend/course/configuration/envvars-config.tsx b/src/packages/frontend/course/configuration/envvars-config.tsx
@@ -53,7 +53,7 @@ export const EnvironmentVariablesConfig: React.FC<Props> = (props: Props) => {
     setNeedSave(nextVal != inherit);
   }, [nextVal, inherit]);
 
-  // this selector only make sense for cocalc.com and cocalc-cloud on-prem
+  // this selector only make sense for cocalc.com and cocalc-onprem
   if (
     customize_kucalc !== KUCALC_COCALC_COM &&
     customize_kucalc !== KUCALC_ON_PREMISES
diff --git a/src/packages/frontend/course/configuration/student-project-software-environment.tsx b/src/packages/frontend/course/configuration/student-project-software-environment.tsx
@@ -215,7 +215,7 @@ export const StudentProjectSoftwareEnvironment: React.FC<Props> = ({
     );
   }
 
-  // this selector only make sense for cocalc.com and cocalc-cloud on-prem
+  // this selector only make sense for cocalc.com and cocalc-onprem
   if (
     customize_kucalc !== KUCALC_COCALC_COM &&
     customize_kucalc !== KUCALC_ON_PREMISES
diff --git a/src/packages/frontend/project/settings/datastore.tsx b/src/packages/frontend/project/settings/datastore.tsx
@@ -4,7 +4,7 @@
  */
 
 /*
-Datastore (only for kucalc and cocalc-cloud)
+Datastore (only for kucalc and cocalc-onprem)
 */
 
 import {
diff --git a/src/packages/next/components/landing/cocalc-com-features.tsx b/src/packages/next/components/landing/cocalc-com-features.tsx
@@ -463,7 +463,7 @@ export function CoCalcComFeatures() {
                       style={link}
                       href="https://doc.cocalc.com/cocalc-cloud.html"
                     >
-                      <strong>cocalc-cloud</strong>
+                      <strong>cocalc-onprem</strong>
                     </A>
                     .
                   </li>
diff --git a/src/packages/next/pages/auth/ROUTING.md b/src/packages/next/pages/auth/ROUTING.md
@@ -18,4 +18,4 @@ hence that check happens upon SSO strategy initialization.
 ## Backend
 
 - Kucalc's proxy service redirects all `/auth` routes to `hub-next`, but since this is still setting up all the auth routes, everything should be fine.
-- cocalc-cloud's ingress route configuration file has to list them as well (shorter route names take precedence in the nginx ingress controller)
+- cocalc-onprem's ingress route configuration file has to list them as well (shorter route names take precedence in the nginx ingress controller)
diff --git a/src/packages/next/pages/pricing/onprem.tsx b/src/packages/next/pages/pricing/onprem.tsx
@@ -50,11 +50,11 @@ function Body() {
     return (
       <>
         <Title level={2}>
-          CoCalc Cloud <Icon name="network-wired" style={{ float: "right" }} />
+          CoCalc OnPrem <Icon name="network-wired" style={{ float: "right" }} />
         </Title>
         <Paragraph>
           <Text strong>
-            <A href="https://doc-cloud.cocalc.com/">CoCalc Cloud</A>
+            <A href="https://onprem.cocalc.com/">CoCalc OnPrem</A>
           </Text>{" "}
           is an on-prem version of CoCalc that runs on a full-fledged{" "}
           <A href={"https://kubernetes.io"}>Kubernetes Cluster</A>. The
@@ -140,20 +140,19 @@ function Body() {
         </Paragraph>
         <Paragraph>
           For more details, see the{" "}
-          <A href="https://doc-cloud.cocalc.com/">CoCalc Cloud documentation</A>
-          .
+          <A href="https://onprem.cocalc.com/">CoCalc OnPrem documentation</A>.
         </Paragraph>
-        <Title level={3}>Purchasing CoCalc Cloud</Title>
+        <Title level={3}>Purchasing CoCalc OnPrem</Title>
         <Paragraph>
-          CoCalc Cloud is a scalable solution and the license price depends on
+          CoCalc OnPrem is a scalable solution and the license price depends on
           the use case and expected number of users. Additionally, various
           levels of support and custom development can be negotiated for an
           additional cost.
           <Button
             type="link"
             onClick={() =>
               router.push(
-                `/support/new?hideExtra=true&type=purchase&subject=CoCalc%20Cloud%20Quote&body=${body}&title=Purchase%20CoCalc-Cloud`,
+                `/support/new?hideExtra=true&type=purchase&subject=CoCalc%20OnPrem%20Quote&body=${body}&title=Purchase%20CoCalc-OnPrem`,
               )
             }
           >
@@ -167,7 +166,7 @@ function Body() {
             size="large"
             onClick={() =>
               router.push(
-                `/support/new?hideExtra=true&type=purchase&subject=CoCalc%20Cloud%20Business&body=${body}&title=Purchase%20CoCalc-Cloud`,
+                `/support/new?hideExtra=true&type=purchase&subject=CoCalc%20OnPrem%20Business&body=${body}&title=Purchase%20CoCalc-OnPrem`,
               )
             }
           >
@@ -179,7 +178,7 @@ function Body() {
             size="large"
             onClick={() =>
               router.push(
-                `/support/new?hideExtra=true&type=purchase&subject=CoCalc%20Cloud%20Academic&body=${body}&title=Purchase%20CoCalc-Cloud`,
+                `/support/new?hideExtra=true&type=purchase&subject=CoCalc%20OnPrem%20Academic&body=${body}&title=Purchase%20CoCalc-OnPrem`,
               )
             }
           >
diff --git a/src/packages/util/quota.test.ts b/src/packages/util/quota.test.ts
@@ -719,7 +719,7 @@ describe("main quota functionality", () => {
   it("allow for much larger max_upgrades", () => {
     const site_settings = {
       max_upgrades: {
-        // taken from cocalc-cloud example configuration
+        // taken from cocalc-onprem example configuration
         memory: 32000,
         cores: 16,
       },
@@ -826,7 +826,7 @@ describe("main quota functionality", () => {
         cpu_oc: 1,
       },
       max_upgrades: {
-        // taken from cocalc-cloud example configuration
+        // taken from cocalc-onprem example configuration
         memory: 32000,
         memory_request: 32000,
         cores: 16,
@@ -873,7 +873,7 @@ describe("main quota functionality", () => {
         cpu_oc: 1,
       },
       max_upgrades: {
-        // taken from cocalc-cloud example configuration
+        // taken from cocalc-onprem example configuration
         memory: 32000,
         memory_request: 32000,
         cores: 16,
diff --git a/src/packages/util/upgrades/consts.ts b/src/packages/util/upgrades/consts.ts
@@ -56,6 +56,6 @@ export const BOOST: Limits = {
   disk: { min: 0, dflt: 0, max: MAX_DISK_GB - 1 * DISK_DEFAULT_GB },
 } as const;
 
-// on-prem: this dedicated VM machine name is only used for cocalc-cloud
+// on-prem: this dedicated VM machine name is only used for cocalc-onprem
 // the project's resource quotas are encoded in the license spec, and not taken from the known VM specs
 export const DEDICATED_VM_ONPREM_MACHINE = "onprem";
diff --git a/src/packages/util/upgrades/quota.ts b/src/packages/util/upgrades/quota.ts
@@ -107,7 +107,7 @@ interface QuotaBase {
   };
 }
 
-// additional fields of the quota result, which are used for onprem (cocalc-cloud) applications
+// additional fields of the quota result, which are used for onprem (cocalc-onprem) applications
 interface QuotaOnPrem {
   ext_rw?: boolean;
   patch?: { [key: string]: string | object }[];
@@ -983,7 +983,7 @@ export function quota_with_reasons(
       member_host: true,
     };
     if (dedicated_vm.machine === DEDICATED_VM_ONPREM_MACHINE) {
-      // for cocalc cloud, quotas are taken from that license (and only that license)
+      // for cocalc onprem, quotas are taken from that license (and only that license)
       if (isSiteLicenseQuotaSetting(dedicated_vm_license)) {
         const dvlq = dedicated_vm_license.quota;
         Object.assign(dedicated_quota, {

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ export const StudentProjectSoftwareEnvironment: React.FC<Props> = ({`
`215`	`215`	`);`
`216`	`216`	`}`
`217`	`217`
`218`		`- // this selector only make sense for cocalc.com and cocalc-cloud on-prem`
	`218`	`+ // this selector only make sense for cocalc.com and cocalc-onprem`
`219`	`219`	`if (`
`220`	`220`	`customize_kucalc !== KUCALC_COCALC_COM &&`
`221`	`221`	`customize_kucalc !== KUCALC_ON_PREMISES`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ export function CoCalcComFeatures() {`
`463`	`463`	`style={link}`
`464`	`464`	`href="https://doc.cocalc.com/cocalc-cloud.html"`
`465`	`465`	`>`
`466`		`- <strong>cocalc-cloud</strong>`
	`466`	`+ <strong>cocalc-onprem</strong>`
`467`	`467`	`</A>`
`468`	`468`	`.`
`469`	`469`	`</li>`