From ac7268731ae843af1ebc11c190a2082cb7eeeadd Mon Sep 17 00:00:00 2001 From: pvincent Date: Wed, 9 Oct 2024 11:38:59 +0400 Subject: [PATCH] domain + subdomain --- recipes/base/common.sh | 22 ++++++++ recipes/cagettepei/crud.sh | 17 +++--- recipes/discourse/crud.sh | 42 +++++++++++---- recipes/dolibarr/crud.sh | 10 +++- recipes/odoo12/crud.sh | 10 +++- recipes/odoo15/crud.sh | 10 +++- recipes/stub/crud.sh | 6 +-- recipes/wordpress/crud.sh | 10 +++- scripts/miaou | 3 +- templates/apps/discourse/forum.yml.j2 | 77 +++++++++++++++++++++++++++ 10 files changed, 179 insertions(+), 28 deletions(-) create mode 100644 recipes/base/common.sh create mode 100644 templates/apps/discourse/forum.yml.j2 diff --git a/recipes/base/common.sh b/recipes/base/common.sh new file mode 100644 index 0000000..1b9ebb7 --- /dev/null +++ b/recipes/base/common.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +function check_db_maria_exists() { + db-maria list | grep -q "$1" +} + +function check_db_postgres_exists() { + db-psql list | grep -q "$1" +} + +function extract_domain_from_fqdn() { + fqdn=$1 + part1=$(builtin echo "$fqdn" | rev | cut -d'.' -f1 | rev) + part2=$(builtin echo "${fqdn%."$part1"}" | rev | cut -d'.' -f1 | rev) + builtin echo "$part2.$part1" +} + +function extract_subdomain_from_fqdn() { + fqdn=$1 + domain=$(extract_domain_from_fqdn "$fqdn") + builtin echo "${fqdn%."$domain"}" +} diff --git a/recipes/cagettepei/crud.sh b/recipes/cagettepei/crud.sh index c6cb6d7..28e8de4 100755 --- a/recipes/cagettepei/crud.sh +++ b/recipes/cagettepei/crud.sh @@ -1,9 +1,5 @@ #!/bin/bash -function check_database_exists() { - db-maria list | grep -q "$longname" -} - function check_port_used() { # shellcheck disable=SC2034 usedport=$(lxc exec "$container" -- bash -c "grep Listen /etc/apache2/sites-enabled/$longname.conf | cut -d' ' -f2") @@ -21,7 +17,7 @@ function check_config_defined() { function _read() { disable_trace - check_database_exists + check_db_maria_exists "$longname" check_container "$container" check_port_used check_config_defined @@ -139,11 +135,12 @@ function usage() { # init_strict +source "$(dirname "$0")/../base/common.sh" COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -175,6 +172,12 @@ while true; do longname="cagettepei-$shortname" shift 2 ;; + --domain) + shift 2 + ;; + --subdomain) + shift 2 + ;; -c) [[ "$action" == "unset" ]] || usage action="_create" @@ -200,7 +203,7 @@ while true; do break ;; *) - echo "Internal error!" + echo "Internal error: unrecognized option: <$1>" exit 1 ;; esac diff --git a/recipes/discourse/crud.sh b/recipes/discourse/crud.sh index 38ff692..762714b 100755 --- a/recipes/discourse/crud.sh +++ b/recipes/discourse/crud.sh @@ -1,12 +1,26 @@ #!/bin/bash +function check_service_running() { + lxc exec "$container" -- bash -c "docker ps --format {{.Names}} | grep $1" +} + function _read() { + disable_trace + check_db_postgres_exists "$longname" + check_container "$container" + check_service_running "$shortname" + enable_trace return 0 } function _create() { - echo "creating discourse-docker instance for <$shortname> ... " - echo "initialize discourse-docker $shortname $longname ... OK" + echo "creating discourse instance for <$shortname> ... " + echo "initialize discourse $shortname $longname ... OK" + + mkdir -p "$MIAOU_CONFIGDIR/apps/discourse" + APP_DOMAIN=$domain APP_SUBDOMAIN=$subdomain APP_FQDN=$fqdn APP_PORT=$port APP_NAME=$shortname tera -e --env-key env -t "$MIAOU_BASEDIR/templates/apps/discourse/forum.yml.j2" -o "$MIAOU_CONFIGDIR/apps/discourse/$longname.yml" "$MIAOU_CONFIGDIR/miaou.expanded.yaml" + echo "creating templates ... OK" + } function _update() { @@ -25,12 +39,12 @@ function usage() { ### MAIN # init_strict - +source "$(dirname "$0")/../base/common.sh" COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,data: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain:,data: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -41,7 +55,8 @@ container="unset" shortname="unset" longname="unset" fqdn="unset" -data="unset" +domain="unset" +subdomain="unset" # extract options and their arguments into variables. while true; do @@ -60,11 +75,19 @@ while true; do ;; --name) shortname=$2 - longname="cagettepei-$shortname" + longname="discourse-$shortname" + shift 2 + ;; + --domain) + domain=$2 + shift 2 + ;; + --subdomain) + subdomain=$2 shift 2 ;; --data) - data=$2 + # don't care shift 2 ;; -c) @@ -92,7 +115,7 @@ while true; do break ;; *) - echo "Internal error!" + echoerr "Internal error: unrecognized option: <$1>" exit 1 ;; esac @@ -103,7 +126,8 @@ done "$port" != unset && "$container" != unset && "$fqdn" != unset && - "$data" != unset && + "$domain" != unset && + "$subdomain" != unset && "$shortname" != unset ]] || usage . "$MIAOU_BASEDIR/lib/init.sh" diff --git a/recipes/dolibarr/crud.sh b/recipes/dolibarr/crud.sh index edd8306..7eb374d 100755 --- a/recipes/dolibarr/crud.sh +++ b/recipes/dolibarr/crud.sh @@ -108,7 +108,7 @@ COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -138,6 +138,12 @@ while true; do longname="dolibarr-$shortname" shift 2 ;; + --domain) + shift 2 + ;; + --subdomain) + shift 2 + ;; -c) [[ "$action" == "unset" ]] || usage action="_create" @@ -163,7 +169,7 @@ while true; do break ;; *) - echo "Internal error!" + echo "Internal error: unrecognized option: <$1>" exit 1 ;; esac diff --git a/recipes/odoo12/crud.sh b/recipes/odoo12/crud.sh index c03649c..02fc912 100755 --- a/recipes/odoo12/crud.sh +++ b/recipes/odoo12/crud.sh @@ -111,7 +111,7 @@ COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,data: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain:,data: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -144,6 +144,12 @@ while true; do longname="odoo12-$shortname" shift 2 ;; + --domain) + shift 2 + ;; + --subdomain) + shift 2 + ;; --data) data=$2 shift 2 @@ -173,7 +179,7 @@ while true; do break ;; *) - echoerr "Internal error!" + echoerr "Internal error: unrecognized option: <$1>" exit 1 ;; esac diff --git a/recipes/odoo15/crud.sh b/recipes/odoo15/crud.sh index 82a1a8a..e49f88a 100755 --- a/recipes/odoo15/crud.sh +++ b/recipes/odoo15/crud.sh @@ -127,7 +127,7 @@ COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,data: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain:,data: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -164,6 +164,12 @@ while true; do data=$2 shift 2 ;; + --domain) + shift 2 + ;; + --subdomain) + shift 2 + ;; -c) [[ "$action" == "unset" ]] || usage action="_create" @@ -189,7 +195,7 @@ while true; do break ;; *) - echoerr "Internal error!" + echoerr "Internal error: unrecognized option: <$1>" exit 1 ;; esac diff --git a/recipes/stub/crud.sh b/recipes/stub/crud.sh index 8e22a43..238e796 100755 --- a/recipes/stub/crud.sh +++ b/recipes/stub/crud.sh @@ -30,7 +30,7 @@ COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -87,8 +87,8 @@ while true; do break ;; *) - echo "Internal error!" - exit 1 + builtin echo "useless option $1" + shift 2 ;; esac done diff --git a/recipes/wordpress/crud.sh b/recipes/wordpress/crud.sh index d2e91af..fe4fd99 100755 --- a/recipes/wordpress/crud.sh +++ b/recipes/wordpress/crud.sh @@ -132,7 +132,7 @@ COMMAND_NAME=$(basename "$0") # read the options -TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn: -- "$@") +TEMP=$(getopt -n "$COMMAND_NAME" -o crud --long port:,container:,name:,fqdn:,domain:,subdomain: -- "$@") # shellcheck disable=SC2181 [[ "$?" -eq 0 ]] || usage eval set -- "$TEMP" @@ -162,6 +162,12 @@ while true; do longname="wp-$shortname" shift 2 ;; + --domain) + shift 2 + ;; + --subdomain) + shift 2 + ;; -c) [[ "$action" == "unset" ]] || usage action="_create" @@ -187,7 +193,7 @@ while true; do break ;; *) - echo "Internal error!" + echoerr "Internal error: unrecognized option: <$1>" exit 1 ;; esac diff --git a/scripts/miaou b/scripts/miaou index d209651..e98f12c 100755 --- a/scripts/miaou +++ b/scripts/miaou @@ -497,10 +497,11 @@ function build_services() { recipe="$MIAOU_BASEDIR/recipes/$app/crud.sh" if [[ -f "$recipe" ]]; then echo "read [$app:$name] provided by container <$container>" - command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn" + command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn --domain $domain --subdomain $subdomain" [[ "$data" != "null" ]] && command+=" --data \"$data\"" if ! eval "$command -r" >/dev/null; then echoinfo "CREATE RECIPE" + # echo "$command -c" eval "$command -c" echoinfo "CREATE RECIPE: OK" fi diff --git a/templates/apps/discourse/forum.yml.j2 b/templates/apps/discourse/forum.yml.j2 new file mode 100644 index 0000000..6ffe632 --- /dev/null +++ b/templates/apps/discourse/forum.yml.j2 @@ -0,0 +1,77 @@ +# TODO: change SOME_SECRET in this template + +templates: + - "templates/web.template.yml" + - "templates/web.ratelimited.template.yml" + +expose: + - "{{ env.APP_PORT }}:80" + +params: + ## Which Git revision should this container use? (default: tests-passed) + #version: tests-passed + version: latest-release + +env: + DISCOURSE_HOSTNAME: '{{ env.APP_FQDN }}' + + LC_ALL: en_US.UTF-8 + LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 + # DISCOURSE_DEFAULT_LOCALE: en + + ## Uncomment if you want the container to be started with the same + ## hostname (-h option) as specified above (default "$hostname-$config") + DOCKER_USE_HOSTNAME: true + + ## TODO: List of comma delimited emails that will be made admin and developer + ## on initial signup example 'user1@example.com,user2@example.com' + DISCOURSE_DEVELOPER_EMAILS: 'pvincent@artcode.re' + + ## TODO: The SMTP mail server used to validate new accounts and send notifications + # SMTP ADDRESS, username, and password are required + # WARNING the char '#' in SMTP password can cause problems! + DISCOURSE_SMTP_ADDRESS: mail1.zourit.net + DISCOURSE_SMTP_PORT: 587 + DISCOURSE_SMTP_USER_NAME: postmaster@artcode.re + DISCOURSE_SMTP_PASSWORD: bHv5mTYyh3aJJKw + #DISCOURSE_SMTP_ENABLE_START_TLS: true # (optional, default true) + #DISCOURSE_SMTP_DOMAIN: discourse.example.com # (required by some providers) + #DISCOURSE_NOTIFICATION_EMAIL: noreply@discourse.example.com # (address to send notifications from) + + + ## TODO: configure connectivity to the databases + DISCOURSE_DB_NAME: libre.re + DISCOURSE_DB_USERNAME: libre.re + DISCOURSE_DB_PASSWORD: libre.re + DISCOURSE_DB_HOST: ct1.lxd + + DISCOURSE_REDIS_HOST: ct1.lxd + +volumes: + - volume: + host: /var/discourse/shared/web-only + guest: /shared + - volume: + host: /var/discourse/shared/web-only/log/var-log + guest: /var/log + +## Plugins go here +## see https://meta.discourse.org/t/19157 for details +hooks: + after_code: + - exec: + cd: $home/plugins + cmd: + - git clone https://github.com/discourse/docker_manager.git + {%- if services[env.APP_DOMAIN][env.APP_SUBDOMAIN]['data']['discourse']['plugins'] %} + {%- for plugin in services[env.APP_DOMAIN][env.APP_SUBDOMAIN]['data']['discourse']['plugins'] %} + - git clone {{ plugin }} + {%- endfor %} + {%- endif %} + +## Remember, this is YAML syntax - you can only have one block with a name +run: + - exec: echo "Beginning of custom commands" + - exec: echo "End of custom commands" + - exec: awk -F\# '{print $1;}' ~/.ssh/authorized_keys | awk 'BEGIN { print "Authorized SSH keys for this container:"; } NF>=2 {print $NF;}'