use OC_ env prefix

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

docs/helpers/README.md

@@ -71,7 +71,7 @@ For details on deprecation see the [deprecating-variables](https://github.com/ow
 
 Global envvars are gathered by checking if the envvar is available in more than one service. The table created is similar to the service-dependent envvar table but additionally contains a column with all service names where this envvar occurs. The output is rendered in list form where each item is clickable and automatically points to the corresponding service page. The template file can be found at `docs/templates/ADOC_global.tmpl`.
 
-If global envvars do not appear in the list of globals, before checking if the code works, do a manual search in the ocis/services folder with `grep -rn OCIS_xxx` if the envvar in question appears at least twice. If the envvar only appears once, the helpers code works correct.
+If global envvars do not appear in the list of globals, before checking if the code works, do a manual search in the ocis/services folder with `grep -rn OC_xxx` if the envvar in question appears at least twice. If the envvar only appears once, the helpers code works correct.
 
 ## Extended Envvars
 

docs/helpers/changed_envvars.py

@@ -149,7 +149,7 @@ def create_table(type_text, source_dict, from_version, to_version, date_today, t
 	# added and removed envvars
 		# first add all ocis_
 		for key, value in source_dict.items():
-			if key.startswith('OCIS_'):
+			if key.startswith('OC_'):
 				a += add_adoc_line_1(
 						'xref:deployment/services/env-vars-special-scope.adoc[Special Scope Envvars]',
 						key,
@@ -158,7 +158,7 @@ def create_table(type_text, source_dict, from_version, to_version, date_today, t
 					)
 		# then add all others
 		for key, value in source_dict.items():
-			if not key.startswith('OCIS_'):
+			if not key.startswith('OC_'):
 				a += add_adoc_line_1(
 						'xref:{s-path}/xxx.adoc[xxx]',
 						key,
@@ -169,7 +169,7 @@ def create_table(type_text, source_dict, from_version, to_version, date_today, t
 	# deprecated envvars
 		# first add all ocis_
 		for key, value in source_dict.items():
-			if key.startswith('OCIS_'):
+			if key.startswith('OC_'):
 				a += add_adoc_line_2(
 						'xref:deployment/services/env-vars-special-scope.adoc[Special Scope Envvars]',
 						key,
@@ -179,7 +179,7 @@ def create_table(type_text, source_dict, from_version, to_version, date_today, t
 					)
 		# then add all others
 		for key, value in source_dict.items():
-			if not key.startswith('OCIS_'):
+			if not key.startswith('OC_'):
 				a += add_adoc_line_2(
 						'xref:{s-path}/xxx.adoc[xxx]',
 						key,

docs/helpers/configenvextractor.go

@@ -69,8 +69,8 @@ func runIntermediateCode(intermediateCodePath string) {
 	fmt.Println("Running intermediate go code for " + intermediateCodePath)
 	defaultConfigPath := "/etc/ocis"
 	defaultDataPath := "/var/lib/ocis"
-	os.Setenv("OCIS_BASE_DATA_PATH", defaultDataPath)
-	os.Setenv("OCIS_CONFIG_DIR", defaultConfigPath)
+	os.Setenv("OC_BASE_DATA_PATH", defaultDataPath)
+	os.Setenv("OC_CONFIG_DIR", defaultConfigPath)
 	out, err := exec.Command("go", "run", intermediateCodePath).CombinedOutput()
 	if err != nil {
 		log.Fatal(string(out), err)

docs/helpers/extended_vars.yaml

@@ -124,10 +124,10 @@ variables:
   default_value: ""
   description: ""
   do_ignore: true
-- rawname: OCIS_BASE_DATA_PATH
+- rawname: OC_BASE_DATA_PATH
   path: ocis-pkg/config/defaults/paths.go:23
   foundincode: true
-  name: OCIS_BASE_DATA_PATH
+  name: OC_BASE_DATA_PATH
   type: string
   default_value: ""
   description: The base directory location used by several services and for user data.
@@ -135,10 +135,10 @@ variables:
     Services can have, if available, an individual setting with an own environment
     variable.
   do_ignore: false
-- rawname: OCIS_CONFIG_DIR
+- rawname: OC_CONFIG_DIR
   path: ocis-pkg/config/defaults/paths.go:56
   foundincode: true
-  name: OCIS_CONFIG_DIR
+  name: OC_CONFIG_DIR
   type: string
   default_value: ""
   description: The default directory location for config files. See the General Info