kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-02-22 12:29:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced http_port by dedicated application port -> Result of previous bugs

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-02-21 05:20:18 +01:00
parent 9f41e25166
commit 88194ac3d3
32 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all/07_applications.yml
View File

@ -126,6 +126,8 @@ defaults_applications:
enabled: true # Activate the OAuth2 Proxy for the LDAP Webinterface
application: lam # Needs to be the same as webinterface
port: 80 # If you use phpldapadmin set it to 8080
database:
central_storage: false # LDAP doesn't use an database in the current configuration. Propably a good idea to implement one later.
# administrator_password: # CHANGE for security reasons in inventory file
# administrator_database_password: # CHANGE for security reasons in inventory file

2
roles/docker-akaunting/templates/docker-compose.yml.j2
View File

@ -10,7 +10,7 @@ services:
build:
context: .
ports:
- 127.0.0.1:{{http_port}}:80
- 127.0.0.1:{{ports.localhost.http[application_id]}}:80
volumes:
- data:/var/www/html
environment:

2
roles/docker-attendize/templates/docker-compose.yml.j2
View File

@ -7,7 +7,7 @@ services:
web:
image: "attendize_web:{{applications.attendize.version}}"
ports:
- "{{http_port}}:80"
- "{{ports.localhost.http[application_id]}}:80"
volumes:
- .:/usr/share/nginx/html
- .:/var/www

2
roles/docker-baserow/templates/docker-compose.yml.j2
View File

@ -11,7 +11,7 @@ services:
volumes:
- data:/baserow/data
ports:
- "{{http_port}}:80"
- "{{ports.localhost.http[application_id]}}:80"
{% include 'templates/docker/container/networks.yml.j2' %}
{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}

2
roles/docker-discourse/templates/discourse_application.yml.j2
View File

@ -15,7 +15,7 @@ templates:
## If you want Discourse to share a port with another webserver like Apache or nginx,
## see https://meta.discourse.org/t/17247 for details
expose:
- "127.0.0.1:{{http_port}}:80" # http
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80" # http
params:
db_default_text_search_config: "pg_catalog.english"

2
roles/docker-elk/templates/docker-compose.yml.j2
View File

@ -57,7 +57,7 @@ services:
target: /usr/share/kibana/config/kibana.yml
read_only: true
ports:
- "127.0.0.1:{{ http_port }}:5601"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:5601"
depends_on:
- elasticsearch

2
roles/docker-friendica/templates/docker-compose.yml.j2
View File

@ -8,7 +8,7 @@ services:
volumes:
- data:/var/www/html
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
healthcheck:
# This health check ensures the test email is sent only once to prevent
# hitting SMTP rate limits due to multiple health check executions.

2
roles/docker-funkwhale/templates/docker-compose.yml.j2
View File

@ -56,7 +56,7 @@ services:
#- "{{static_root}}:{{static_root}}:ro"
ports:
# override those variables in your .env file if needed
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
typesense:
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}

2
roles/docker-funkwhale/templates/env.j2
View File

@ -32,7 +32,7 @@ FUNKWHALE_VERSION={{applications.funkwhale.version}}
FUNKWHALE_API_IP=127.0.0.1
# Assuming that the following variable isn't used anymore.
# @todo remove it if this is true
FUNKWHALE_API_PORT={{http_port}}
FUNKWHALE_API_PORT={{ports.localhost.http[application_id]}}:
# The number of web workers to start in parallel. Higher means you can handle
# more concurrent requests, but also leads to higher CPU/Memory usage

2
roles/docker-gitea/templates/docker-compose.yml.j2
View File

@ -6,7 +6,7 @@ services:
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
image: "gitea/gitea:{{applications.gitea.version}}"
ports:
- "127.0.0.1:{{http_port}}:3000"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:3000"
- "{{ports.public.ssh[application_id]}}:22"
volumes:
- data:/data

2
roles/docker-gitlab/templates/docker-compose.yml.j2
View File

@ -9,7 +9,7 @@ services:
hostname: '{{domain}}'
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
- "{{ports.public.ssh[application_id]}}:22"
volumes:
- 'config:/etc/gitlab'

2
roles/docker-jenkins/tasks/main.yml
View File

@ -10,7 +10,7 @@
image: jenkins/jenkins:lts
restart: "{{docker_restart_policy}}"
ports:
- "127.0.0.1:{{http_port}}:8080"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:8080"
volumes:
- jenkins_data:/var/jenkins_home
log_driver: journald

2
roles/docker-joomla/templates/docker-compose.yml.j2
View File

@ -8,7 +8,7 @@ services:
volumes:
- data:/var/www/html
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
{% include 'templates/docker/container/networks.yml.j2' %}
{% include 'templates/docker/container/depends-on-just-database.yml.j2' %}

2
roles/docker-keycloak/templates/docker-compose.yml.j2
View File

@ -8,7 +8,7 @@ services:
command: start --import-realm # imports realms on startup
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
ports:
- "127.0.0.1:{{http_port}}:8080"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:8080"
volumes:
- "{{import_directory_host}}:{{import_directory_docker}}"
{% include 'templates/docker/container/depends-on-just-database.yml.j2' %}

2
roles/docker-listmonk/templates/docker-compose.yml.j2
View File

@ -6,7 +6,7 @@ services:
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
image: listmonk/listmonk:{{applications.listmonk.version}}
ports:
- "127.0.0.1:{{http_port}}:9000"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:9000"
volumes:
- {{docker_compose.directories.config}}config.toml:/listmonk/config.toml
{% include 'templates/docker/container/networks.yml.j2' %}

2
roles/docker-mailu/templates/docker-compose.yml.j2
View File

@ -15,7 +15,7 @@ services:
image: {{docker_source}}/nginx:{{applications.mailu.version}}
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
ports:
- "127.0.0.1:{{ http_port }}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
- "{{networks.internet.ip4}}:25:25"
- "{{networks.internet.ip4}}:465:465"
- "{{networks.internet.ip4}}:587:587"

2
roles/docker-mastodon/templates/docker-compose.yml.j2
View File

@ -11,7 +11,7 @@ services:
healthcheck:
test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
ports:
- "127.0.0.1:{{http_port}}:3000"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:3000"
{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
volumes:
- data:/mastodon/public/system

2
roles/docker-matrix-ansible/templates/vars.yml.j2
View File

@ -32,7 +32,7 @@ matrix_playbook_ssl_enabled: true
devture_traefik_config_entrypoint_web_secure_enabled: false
# If your reverse-proxy runs on another machine, consider using `0.0.0.0:81`, just `81` or `SOME_IP_ADDRESS_OF_THIS_MACHINE:81`
devture_traefik_container_web_host_bind_port: "127.0.0.1:{{http_port}}"
devture_traefik_container_web_host_bind_port: "127.0.0.1:{{ports.localhost.http[application_id]}}"
# We bind to `127.0.0.1` by default (see above), so trusting `X-Forwarded-*` headers from
# a reverse-proxy running on the local machine is safe enough.

2
roles/docker-mediawiki/templates/docker-compose.yml.j2
View File

@ -10,7 +10,7 @@ services:
volumes:
- "mediawiki-data:/var/www/html/"
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
{% include 'templates/docker/container/networks.yml.j2' %}
{% include 'templates/docker/container/depends-on-just-database.yml.j2' %}

2
roles/docker-moodle/templates/docker-compose.yml.j2
View File

@ -5,7 +5,7 @@ services:
container_name: moodle
image: docker.io/bitnami/moodle:{{applications.moodle.version}}
ports:
- 127.0.0.1:{{http_port}}:8080
- 127.0.0.1:{{ports.localhost.http[application_id]}}:8080
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
volumes:
- 'moodle:/bitnami/moodle'

2
roles/docker-mybb/templates/docker-compose.yml.j2
View File

@ -22,7 +22,7 @@ services:
image: nginx:mainline
restart: {{docker_restart_policy}}
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
volumes:
- "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
- "data:/var/www/html:ro"

2
roles/docker-nextcloud/templates/docker-compose.yml.j2
View File

@ -26,7 +26,7 @@ services:
driver: journald
restart: {{docker_restart_policy}}
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
volumes:
- "{{docker_compose.directories.volumes}}nginx.conf:/etc/nginx/nginx.conf:ro"
volumes_from:

2
roles/docker-openproject/templates/docker-compose.yml.j2
View File

@ -23,7 +23,7 @@ services:
container_name: openproject-proxy
command: "./docker/prod/proxy"
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
environment:
APP_HOST: web
depends_on:

2
roles/docker-peertube/templates/docker-compose.yml.j2
View File

@ -9,7 +9,7 @@ services:
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
ports:
- "1935:1935" # @todo Add to ports
- "127.0.0.1:{{http_port}}:9000"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:9000"
volumes:
- assets:/app/client/dist
- data:/data

4
roles/docker-peertube/templates/peertube.conf.j2
View File

@ -21,7 +21,7 @@ server {
send_timeout 10m;
#adapt
proxy_pass http://127.0.0.1:{{http_port}};
proxy_pass http://127.0.0.1:{{ports.localhost.http[application_id]}};
}
location / {
@ -62,7 +62,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://127.0.0.1:{{http_port}};
proxy_pass http://127.0.0.1:{{ports.localhost.http[application_id]}};
}
location /socket.io {

2
roles/docker-phpmyadmin/templates/docker-compose.yml.j2
View File

@ -7,7 +7,7 @@ services:
container_name: phpmyadmin
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
{% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
{% include 'templates/docker/container/networks.yml.j2' %}
healthcheck:

2
roles/docker-pixelfed/templates/docker-compose.yml.j2
View File

@ -11,7 +11,7 @@ services:
- "data:/var/www/storage"
- "./env:/var/www/.env"
ports:
- "{{http_port}}:80"
- "{{ports.localhost.http[application_id]}}:80"
{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
{% include 'templates/docker/container/networks.yml.j2' %}
worker:

2
roles/docker-portfolio/templates/docker-compose.yml.j2
View File

@ -6,7 +6,7 @@ services:
image: application-portfolio
container_name: portfolio
ports:
- 127.0.0.1:{{http_port}}:5000
- 127.0.0.1:{{ports.localhost.http[application_id]}}:5000
volumes:
- {{docker_repository_path}}app:/app
restart: unless-stopped

2
roles/docker-roulette-wheel/templates/docker-compose.yml.j2
View File

@ -4,5 +4,5 @@ services:
build:
context: .
ports:
- 127.0.0.1:{{http_port}}:8080
- 127.0.0.1:{{ports.localhost.http[application_id]}}:8080
restart: {{docker_restart_policy}}

2
roles/docker-taiga/templates/docker-compose.yml.j2
View File

@ -79,7 +79,7 @@ services:
taiga-gateway:
image: nginx:alpine
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
volumes:
- {{docker_repository_path}}taiga-gateway/taiga.conf:/etc/nginx/conf.d/default.conf
- static-data:/taiga/static

2
roles/docker-wordpress/templates/docker-compose.yml.j2
View File

@ -9,7 +9,7 @@ services:
build:
context: .
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
volumes:
- data:/var/www/html
healthcheck:

2
roles/docker-yourls/templates/docker-compose.yml.j2
View File

@ -8,7 +8,7 @@ services:
image: yourls:{{applications.yourls.version}}
{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
ports:
- "127.0.0.1:{{http_port}}:80"
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
healthcheck:
test: ["CMD", "curl", "-f", "http://127.0.0.1/admin/"]
interval: 1m