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

Changed yourls to yourls and additional optimations

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-20 10:41:06 +02:00
parent 2db5f75888
commit 98cc3d5070
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
7 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/all/09_ports.yml
View File

@ -12,7 +12,7 @@ ports:
web-app-phpmyadmin: 4181 web-app-phpmyadmin: 4181
web-app-lam: 4182 web-app-lam: 4182
web-app-openproject: 4183 web-app-openproject: 4183
yourls: 4184 web-app-yourls: 4184
pgadmin: 4185 pgadmin: 4185
phpldapadmin: 4186 phpldapadmin: 4186
fusiondirectory: 4187 fusiondirectory: 4187
@ -27,7 +27,7 @@ ports:
web-app-wordpress: 8003 web-app-wordpress: 8003
web-app-mediawiki: 8004 web-app-mediawiki: 8004
web-app-mybb: 8005 web-app-mybb: 8005
yourls: 8006 web-app-yourls: 8006
web-app-mailu: 8007 web-app-mailu: 8007
web-app-elk: 8008 web-app-elk: 8008
web-app-mastodon: 8009 web-app-mastodon: 8009

2
group_vars/all/10_networks.yml
View File

@ -66,7 +66,7 @@ defaults_networks:
subnet: 192.168.102.160/28 subnet: 192.168.102.160/28
taiga: taiga:
subnet: 192.168.102.176/28 subnet: 192.168.102.176/28
yourls: web-app-yourls:
subnet: 192.168.102.192/28 subnet: 192.168.102.192/28
web-app-discourse: web-app-discourse:
subnet: 192.168.102.208/28 subnet: 192.168.102.208/28

2
roles/sys-hlth-webserver/templates/sys-hlth-webserver.py.j2
View File

@ -19,7 +19,7 @@ def get_expected_statuses(domain: str, parts: list[str], redirected_domains: set
return [404] return [404]
if (parts and parts[0] == 'www') or (domain in redirected_domains): if (parts and parts[0] == 'www') or (domain in redirected_domains):
return [301] return [301]
if domain == '{{domains | get_domain('yourls')}}': if domain == '{{domains | get_domain('web-app-yourls')}}':
return [403] return [403]
return [200, 302, 301] return [200, 302, 301]

9
roles/web-app-yourls/config/main.yml
View File

@ -1,16 +1,15 @@
version: "latest"
oauth2_proxy: oauth2_proxy:
application: "application" application: "application"
port: "80" port: "80"
allowed_groups: allowed_groups:
- "yourls-administrator" - "web-app-yourls-administrator"
acl: acl:
blacklist: blacklist:
- "/admin/" # Protects the admin area - "/admin/" # Protects the admin area
features: features:
matomo: true matomo: true
css: true css: true
port-ui-desktop: true port-ui-desktop: true
central_database: true central_database: true
oauth2: true oauth2: true
domains: domains:
@ -22,3 +21,7 @@ docker:
services: services:
database: database:
enabled: true enabled: true
yourls:
version: "latest"
name: "yourls"
image: "yourls"

3
roles/web-app-yourls/templates/docker-compose.yml.j2
View File

@ -3,7 +3,8 @@
application: application:
{% set container_port = 80 %} {% set container_port = 80 %}
{% set container_healthcheck = 'http://127.0.0.1/admin/' %} {% set container_healthcheck = 'http://127.0.0.1/admin/' %}
image: yourls:{{applications.yourls.version}} image: "{{ yourls_image }}:{{ yourls_version }}"
container_name: "{{ yourls_container }}"
{% include 'roles/docker-container/templates/base.yml.j2' %} {% include 'roles/docker-container/templates/base.yml.j2' %}
ports: ports:
- "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}" - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"

12
roles/web-app-yourls/templates/env.j2
View File

@ -1,9 +1,9 @@
YOURLS_DB_HOST: "{{database_host}}" YOURLS_DB_HOST: "{{ database_host }}"
YOURLS_DB_USER: "{{database_username}}" YOURLS_DB_USER: "{{ database_username }}"
YOURLS_DB_PASS: "{{database_password}}" YOURLS_DB_PASS: "{{ database_password }}"
YOURLS_DB_NAME: "{{database_name}}" YOURLS_DB_NAME: "{{ database_name }}"
YOURLS_SITE: "{{ domains | get_url(application_id, web_protocol) }}" YOURLS_SITE: "{{ domains | get_url(application_id, web_protocol) }}"
YOURLS_USER: "{{applications.yourls.users.administrator.username}}" YOURLS_USER: "{{ yourls_user }}"
YOURLS_PASS: "{{applications | get_app_conf(application_id, 'credentials.administrator_password', True)}}" YOURLS_PASS: "{{ yourls_password }}"
# The following deactivates the login mask for admins, if the oauth2 proxy is activated # The following deactivates the login mask for admins, if the oauth2 proxy is activated
YOURLS_PRIVATE: "{{not (applications | get_app_conf(application_id, 'features.oauth2', False))}}" YOURLS_PRIVATE: "{{not (applications | get_app_conf(application_id, 'features.oauth2', False))}}"

9
roles/web-app-yourls/vars/main.yml
View File

@ -1,2 +1,7 @@
application_id: "yourls" application_id: "web-app-yourls"
database_type: "mariadb" database_type: "mariadb"
yourls_user: "{{ applications | get_app_conf(application_id, 'users.administrator.username', True) }}"
yourls_password: "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
yourls_version: "{{ applications | get_app_conf(application_id, 'docker.services.yourls.version', True) }}"
yourls_image: "{{ applications | get_app_conf(application_id, 'docker.services.yourls.image', True) }}"
yourls_name: "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"