From 6e7a28c2aef7e536be24c21425fe4ac32a5fb61c Mon Sep 17 00:00:00 2001 From: ace Date: Mon, 6 May 2024 03:00:59 +0300 Subject: [PATCH] update and fix sample vars --- inventory/ghp/sample/group_vars/all/all.yaml | 6 +-- .../ghp/sample/group_vars/k8s/nextcloud.yaml | 44 +------------------ 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/inventory/ghp/sample/group_vars/all/all.yaml b/inventory/ghp/sample/group_vars/all/all.yaml index 7d63f09..597868c 100644 --- a/inventory/ghp/sample/group_vars/all/all.yaml +++ b/inventory/ghp/sample/group_vars/all/all.yaml @@ -22,13 +22,13 @@ metallb_bgp_aggregation_length: 24 ## Nginx Ingress ## ### Internal ### -internal_ingress_class: "ghp-internal-nginx" +internal_ingress_class: "{{ namespace }}-internal-nginx" internal_loadbalancer_ip: "192.168.250.0" ### External ### -internal_ingress_class: "ghp-external-nginx" +external_ingress_class: "{{ namespace }}-external-nginx" external_loadbalancer_ip: "192.168.250.10" ### Local ### -internal_ingress_class: "ghp-local-nginx" +local_ingress_class: "{{ namespace }}-local-nginx" local_loadbalancer_ip: "192.168.250.20" ## External-dns ## diff --git a/inventory/ghp/sample/group_vars/k8s/nextcloud.yaml b/inventory/ghp/sample/group_vars/k8s/nextcloud.yaml index a974cad..b4df07e 100644 --- a/inventory/ghp/sample/group_vars/k8s/nextcloud.yaml +++ b/inventory/ghp/sample/group_vars/k8s/nextcloud.yaml @@ -1,43 +1 @@ -nextcloud_values: - nextcloud: - configs: - mail.fix.config.php: |- - 60, - ); - fix.config.php: |- - ['{{ web_proxy_internal_ip }}'], - 'overwriteprotocol' => 'https', - 'overwrite.cli.url' => 'https://nextcloud.{{ domain }}', - 'mail_smtpstreamoptions' => - array ( - 'ssl' => - array ( - 'allow_self_signed' => true, - 'verify_peer' => false, - 'verify_peer_name' => false, - ), - ), - ); - rgw.config.php: |- - array( - 'class' => '\\OC\\Files\\ObjectStore\\S3', - 'arguments' => array( - 'bucket' => 'nextcloud', - 'autocreate' => true, - 'key' => 'K4PNZLSTLIDQJMZUV27P', - 'secret' => 'iPScsni8RS2aT9MFymfQYLPD7W8dVrRqFpafBKDc', - 'hostname' => 'sds1-osd1.lan', - 'port' => 8080, - 'use_ssl' => false, - 'num_buckets' => 16, - 'region' => 'us-east-1', - 'use_path_style' => true - ), - ), - ); +nextcloud_values: {}