vynil/domain
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-05-17 16:40:43 +02:00
parent 8d8541fb2d
commit 2e5439e2e7
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/wordpress/presentation.tf
View File

@@ -11,7 +11,7 @@ locals {
dns_name = "${var.sub_domain}.${var.domain_name}" dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name] dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance) app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "wp-admin/load-styles.php?c=0&dir=ltr&load%5Bchunk_0%5D=dashicons,admin-bar,common,forms,admin-menu,dashboard,list-tables,edit,revisions,media,themes,about,nav-menus,wp-pointer,widgets&load%5Bchunk_1%5D=,site-icon,l10n,buttons,wp-auth-check" icon = "load-styles.php?c=0&dir=ltr&load%5Bchunk_0%5D=dashicons,admin-bar,common,forms,admin-menu,dashboard,list-tables,edit,revisions,media,themes,about,nav-menus,wp-pointer,widgets&load%5Bchunk_1%5D=,site-icon,l10n,buttons,wp-auth-check"
request_headers = { request_headers = {
"Content-Type" = "application/json" "Content-Type" = "application/json"
Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}" Authorization = "Bearer ${data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]}"
@@ -51,7 +51,7 @@ module "application" {
component = var.component component = var.component
instance = var.instance instance = var.instance
app_group = var.app_group app_group = var.app_group
dns_name = local.dns_name dns_name = "${local.dns_name}/wp-admin"
icon = local.icon icon = local.icon
protocol_provider = module.oauth2.provider-id protocol_provider = module.oauth2.provider-id
providers = { providers = {

19
apps/wordpress/wordpress_ConfigMap.tf
View File

@@ -50,6 +50,13 @@ resource "kubectl_manifest" "wordpress_files" {
"vynil-configurator.sh": |- "vynil-configurator.sh": |-
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
set_opt() {
if wp option get "$1" >/dev/null 2>&1;then
wp option update --format=json "$1" "$2"
else
wp option add --format=json "$1" "$2"
fi
}
if [ ! -f "$(pwd)/wp-config.php" ];then if [ ! -f "$(pwd)/wp-config.php" ];then
echo "$${WORDPRESS_CONFIG_EXTRA}" | wp config create --dbname="$${WORDPRESS_DB_NAME}" --dbuser="$${WORDPRESS_DB_USER}" --dbpass="$${WORDPRESS_DB_PASSWORD}" --dbhost="$${WORDPRESS_DB_HOST}" --extra-php echo "$${WORDPRESS_CONFIG_EXTRA}" | wp config create --dbname="$${WORDPRESS_DB_NAME}" --dbuser="$${WORDPRESS_DB_USER}" --dbpass="$${WORDPRESS_DB_PASSWORD}" --dbhost="$${WORDPRESS_DB_HOST}" --extra-php
fi fi
@@ -78,11 +85,13 @@ resource "kubectl_manifest" "wordpress_files" {
wp language plugin install --all $WORDPRESS_LOCALE wp language plugin install --all $WORDPRESS_LOCALE
wp language core activate $WORDPRESS_LOCALE wp language core activate $WORDPRESS_LOCALE
fi fi
if wp option get mo_oauth_apps_list >/dev/null 2>&1;then set_opt mo_oauth_apps_list "$WORDPRESS_SSO_CONFIG"
wp option update --format=json mo_oauth_apps_list "$WORDPRESS_SSO_CONFIG" set_opt mo_debug_check '"0"'
else set_opt mo_oauth_client_new_registration '"true"'
wp option add --format=json mo_oauth_apps_list "$WORDPRESS_SSO_CONFIG" set_opt mo_oc_valid_discovery_ep '"1"'
fi set_opt mo_discovery_validation '"valid"'
set_opt mo_attr_option '"automatic"'
set_opt mo_debug_enable '"on"'
for ADMIN in $(echo "$WORDPRESS_ADMINS"|sed 's/;/ /g;s/,/ /g');do for ADMIN in $(echo "$WORDPRESS_ADMINS"|sed 's/;/ /g;s/,/ /g');do
if wp user get $ADMIN >/dev/null 2>&1;then if wp user get $ADMIN >/dev/null 2>&1;then
wp user add-role $ADMIN administrator wp user add-role $ADMIN administrator