From 32f5940e0c431e66a87b9e4d27095640481384df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Tue, 24 Oct 2023 18:26:29 +0200
Subject: [PATCH] fix

---
 share/organisation/gitea-user.tf |  2 +-
 share/organisation/index.yaml    | 98 ++++++++++++++++----------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/share/organisation/gitea-user.tf b/share/organisation/gitea-user.tf
index 8383fad..481a22c 100644
--- a/share/organisation/gitea-user.tf
+++ b/share/organisation/gitea-user.tf
@@ -88,7 +88,7 @@ resource "gitea_public_key" "user-ci-keys" {
 
 resource "gitea_org" "orga" {
   count = var.haveGitea?1:0
-  name = "${var.instance}"
+  name = "${trimprefix(var.instance,"org-")}"
 }
 
 resource "gitea_repository" "deploy" {
diff --git a/share/organisation/index.yaml b/share/organisation/index.yaml
index 3b2370d..d201bc6 100644
--- a/share/organisation/index.yaml
+++ b/share/organisation/index.yaml
@@ -6,57 +6,36 @@ metadata:
   name: organisation
   description: null
 options:
-  haveGitea:
-    default: false
-    examples:
-    - false
-    type: boolean
-  datasets:
-    default: []
-    items:
-      properties:
-        engine:
-          default: pg
-          type: string
-        name:
-          default: ''
-          type: string
-      type: object
-    type: array
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  stages:
-    default: []
-    items:
-      properties:
-        name:
-          default: prod
-          type: string
-      type: object
-    type: array
   app-group:
     default: dev
     examples:
     - dev
     type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  ingress-class:
-    default: traefik
+  distributions:
+    default:
+      core: core
+      domain: domain
     examples:
-    - traefik
-    type: string
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
   backups:
     default:
       enable: false
@@ -87,21 +66,42 @@ options:
         default: backup-settings
         type: string
     type: object
-  distributions:
-    default:
-      core: core
-      domain: domain
+  ingress-class:
+    default: traefik
     examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
+    - traefik
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  haveGitea:
+    default: false
+    examples:
+    - false
+    type: boolean
+  datasets:
+    default: []
+    items:
+      properties:
+        engine:
+          default: pg
+          type: string
+        name:
+          default: ''
+          type: string
+      type: object
+    type: array
+  stages:
+    default: []
+    items:
+      properties:
+        name:
+          default: prod
+          type: string
+      type: object
+    type: array
 dependencies: []
 providers:
   kubernetes: true