Compare commits
3 Commits
0bf2a34edd
...
3110f399e6
| Author | SHA1 | Date | |
|---|---|---|---|
| 3110f399e6 | |||
| 3a65653130 | |||
| 1698d7f88b |
7
.gitignore
vendored
7
.gitignore
vendored
@@ -19,4 +19,11 @@ apps.config
|
||||
|
||||
# generated files
|
||||
all-apps/lb/Caddyfile
|
||||
all-apps/nextcloud/nextcloud.env
|
||||
all-apps/nextcloud/nextcloud_admin_user
|
||||
all-apps/nextcloud/nextcloud_admin_password
|
||||
all-apps/nextcloud/postgres_db
|
||||
all-apps/nextcloud/postgres_user
|
||||
all-apps/nextcloud/postgres_password
|
||||
all-apps/nextcloud/redis_password
|
||||
generated.tfvars
|
||||
29
Makefile
29
Makefile
@@ -1,15 +1,42 @@
|
||||
TERRAFORM_ENV=production
|
||||
|
||||
include apps.config
|
||||
|
||||
# .dirstamp plus && $@ is like make magic to get this rule
|
||||
# to only run if the contents of all-apps changes
|
||||
app/.dirstamp: all-apps/app.service all-apps/docker-compose.yaml $(wildcard all-apps/lb/*) $(wildcard all-apps/nextcloud/*) $(wildcard all-apps/wg-easy/*)
|
||||
rm -Rf app/
|
||||
cp -a all-apps app && touch $@
|
||||
|
||||
# Caddy / lb
|
||||
all-apps/lb/Caddyfile: apps.config make-caddyfile.sh
|
||||
./make-caddyfile.sh > all-apps/lb/Caddyfile
|
||||
|
||||
ignition.json: cl.yaml app/.dirstamp all-apps/lb/Caddyfile
|
||||
# Nextcloud
|
||||
all-apps/nextcloud/nextcloud_admin_user: apps.config
|
||||
echo "$(NEXTCLOUD_ADMIN_USER)" > $@
|
||||
all-apps/nextcloud/nextcloud_admin_password: apps.config
|
||||
echo "$(NEXTCLOUD_ADMIN_PASSWORD)" > $@
|
||||
all-apps/nextcloud/postgres_db: apps.config
|
||||
echo "$(NEXTCLOUD_POSTGRES_DB)" > $@
|
||||
all-apps/nextcloud/postgres_user: apps.config
|
||||
echo "$(NEXTCLOUD_POSTGRES_USER)" > $@
|
||||
all-apps/nextcloud/postgres_password: apps.config
|
||||
echo "$(NEXTCLOUD_POSTGRES_PASSWORD)" > $@
|
||||
all-apps/nextcloud/redis_password: apps.config
|
||||
echo "$(NEXTCLOUD_REDIS_PASSWORD)" > $@
|
||||
all-apps/nextcloud/nextcloud.env: apps.config make-nextcloud-env.sh
|
||||
./make-nextcloud-env.sh
|
||||
|
||||
ignition.json: cl.yaml app/.dirstamp \
|
||||
all-apps/lb/Caddyfile \
|
||||
all-apps/nextcloud/nextcloud_admin_user \
|
||||
all-apps/nextcloud/nextcloud_admin_password \
|
||||
all-apps/nextcloud/postgres_db \
|
||||
all-apps/nextcloud/postgres_user \
|
||||
all-apps/nextcloud/postgres_password \
|
||||
all-apps/nextcloud/redis_password \
|
||||
all-apps/nextcloud/nextcloud.env
|
||||
cat cl.yaml | sudo docker run --rm --volume /home/tjhintz/.ssh/id_rsa.pub:/pwd/ssh-keys --volume ${PWD}:/pwd --workdir /pwd -i quay.io/coreos/butane:latest -d /pwd > ignition.json
|
||||
|
||||
generated.tfvars: apps.config make-generated.sh
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
# TODO generate
|
||||
DOMAIN="nextcloud.nassella.cc"
|
||||
|
||||
NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
|
||||
|
||||
# reverse proxy config
|
||||
@@ -1,2 +1,8 @@
|
||||
ROOT_DOMAIN=example.com
|
||||
APP_CONFIGS="nextcloud,nextcloud wg-easy,wg-easy"
|
||||
APP_CONFIGS="nextcloud,nextcloud wg-easy,wg-easy"
|
||||
NEXTCLOUD_ADMIN_USER=admin
|
||||
NEXTCLOUD_ADMIN_PASSWORD=
|
||||
NEXTCLOUD_POSTGRES_DB=nextcloud
|
||||
NEXTCLOUD_POSTGRES_USER=nextcloud
|
||||
NEXTCLOUD_POSTGRES_PASSWORD=
|
||||
NEXTCLOUD_REDIS_PASSWORD=
|
||||
24
make-nextcloud-env.sh
Executable file
24
make-nextcloud-env.sh
Executable file
@@ -0,0 +1,24 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
. apps.config
|
||||
|
||||
read -r -a APP_CONFIGS <<< "$APP_CONFIGS"
|
||||
|
||||
nextcloud_subdomain=
|
||||
|
||||
for config_string in ${APP_CONFIGS[@]}; do
|
||||
IFS=','
|
||||
read -r -a config <<< "$config_string"
|
||||
|
||||
app=${config[0]}
|
||||
subdomain=${config[1]}
|
||||
|
||||
if [ "$app" = "nextcloud" ]; then
|
||||
nextcloud_subdomain="$subdomain"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "DOMAIN=\"$nextcloud_subdomain.$ROOT_DOMAIN\"" > all-apps/nextcloud/nextcloud.env
|
||||
cat all-apps/nextcloud/nextcloud.env.tmpl >> all-apps/nextcloud/nextcloud.env
|
||||
Reference in New Issue
Block a user