Compare commits
No commits in common. "467de171837c165cd412332584d54201f93b0d41" and "10386c08c28a654199cbc9fe470d27aa31dd7872" have entirely different histories.
467de17183
...
10386c08c2
12 changed files with 270 additions and 275 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
export ANSIBLE_VAULT_PASSWORD_FILE := justfile_directory() + "/.decrypt-pass.txt"
|
export ANSIBLE_VAULT_PASSWORD_FILE := ".decrypt-pass.txt"
|
||||||
export ANSIBLE_BECOME_PASSWORD_FILE := justfile_directory() + "/.become-pass.txt"
|
export ANSIBLE_BECOME_PASSWORD_FILE := ".become-pass.txt"
|
||||||
|
|
||||||
# Debug output, disabled in CI
|
# Debug output, disabled in CI
|
||||||
export ANSIBLE_DISPLAY_ARGS_TO_STDOUT := if env('CI', '') == 'true' { 'false' } else { 'true' }
|
export ANSIBLE_DISPLAY_ARGS_TO_STDOUT := if env('CI', '') == 'true' { 'false' } else { 'true' }
|
||||||
|
|
@ -17,7 +17,6 @@ ansible +ARGS:
|
||||||
list-host:
|
list-host:
|
||||||
uv run ansible-inventory --list
|
uv run ansible-inventory --list
|
||||||
|
|
||||||
[no-cd]
|
|
||||||
encrypt +ARGS:
|
encrypt +ARGS:
|
||||||
uv run ansible-vault encrypt {{ ARGS }}
|
uv run ansible-vault encrypt {{ ARGS }}
|
||||||
|
|
||||||
|
|
@ -27,6 +26,5 @@ encrypt-var NAME +CONTENT='':
|
||||||
decrypt-var FILE NAME:
|
decrypt-var FILE NAME:
|
||||||
uv run ansible localhost -m ansible.builtin.debug -e "@{{ FILE }}" -a var="{{ NAME }}"
|
uv run ansible localhost -m ansible.builtin.debug -e "@{{ FILE }}" -a var="{{ NAME }}"
|
||||||
|
|
||||||
[no-cd]
|
|
||||||
decrypt +ARGS:
|
decrypt +ARGS:
|
||||||
uv run ansible-vault edit {{ ARGS }}
|
uv run ansible-vault edit {{ ARGS }}
|
||||||
|
|
|
||||||
43
files/docker/compose-traefik.yaml
Normal file
43
files/docker/compose-traefik.yaml
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
version: '3'
|
||||||
|
networks:
|
||||||
|
reverse-proxy:
|
||||||
|
external: true
|
||||||
|
services:
|
||||||
|
traefik:
|
||||||
|
container_name: traefix-proxy
|
||||||
|
image: 'traefik:latest'
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- reverse-proxy
|
||||||
|
ports:
|
||||||
|
- '80:80'
|
||||||
|
- '443:443'
|
||||||
|
- '8080:8080'
|
||||||
|
healthcheck:
|
||||||
|
test: 'wget -qO- http://localhost:80/ping || exit 1'
|
||||||
|
interval: 4s
|
||||||
|
timeout: 2s
|
||||||
|
retries: 5
|
||||||
|
volumes:
|
||||||
|
- '/var/run/docker.sock:/var/run/docker.sock:ro'
|
||||||
|
- '/data/coolify/proxy:/traefik'
|
||||||
|
command:
|
||||||
|
- '--ping=true'
|
||||||
|
- '--ping.entrypoint=http'
|
||||||
|
- '--api.dashboard=true'
|
||||||
|
- '--api.insecure=true'
|
||||||
|
- '--entrypoints.http.address=:80'
|
||||||
|
- '--entryPoints.http.forwardedHeaders.trustedIPs=10.0.10.0/24'
|
||||||
|
- '--entrypoints.https.address=:443'
|
||||||
|
- '--entryPoints.https.forwardedHeaders.trustedIPs=10.0.10.0/24'
|
||||||
|
- '--entrypoints.http.http.encodequerysemicolons=true'
|
||||||
|
- '--entryPoints.http.http2.maxConcurrentStreams=50'
|
||||||
|
- '--entrypoints.https.http.encodequerysemicolons=true'
|
||||||
|
- '--entryPoints.https.http2.maxConcurrentStreams=50'
|
||||||
|
- '--providers.docker.exposedbydefault=false'
|
||||||
|
- "--providers.swarm.endpoint=tcp://127.0.0.1:2377"
|
||||||
|
labels:
|
||||||
|
- traefik.enable=true
|
||||||
|
- traefik.http.routers.traefik.entrypoints=http
|
||||||
|
- traefik.http.routers.traefik.service=api@internal
|
||||||
|
- traefik.http.services.traefik.loadbalancer.server.port=8080
|
||||||
191
files/docker/index/adminer-theme-switcher.php
Normal file
191
files/docker/index/adminer-theme-switcher.php
Normal file
|
|
@ -0,0 +1,191 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Quickly switch Adminer themes from browser or command line.
|
||||||
|
* @author Victor Nogueira <github@victornogueira.io>
|
||||||
|
* @link https://github.com/felladrin/adminer-theme-switcher
|
||||||
|
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
|
||||||
|
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
|
||||||
|
*/
|
||||||
|
class AdminerThemeSwitcher
|
||||||
|
{
|
||||||
|
protected static $themeList;
|
||||||
|
|
||||||
|
protected static $option;
|
||||||
|
|
||||||
|
public static $prompt = 'Type the number of the theme you want to use: ';
|
||||||
|
|
||||||
|
public static function run()
|
||||||
|
{
|
||||||
|
if (static::isRunningFromCommandLine()) {
|
||||||
|
static::printListAvailableThemes();
|
||||||
|
static::readOptionFromCommandLine();
|
||||||
|
static::switchTheme();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (static::hasNotSelectedAnOptionFromBrowserYet()) {
|
||||||
|
static::printListAvailableThemes();
|
||||||
|
static::printJavascriptPrompt();
|
||||||
|
} else {
|
||||||
|
static::readOptionFromBrowser();
|
||||||
|
static::switchTheme();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isRunningFromCommandLine()
|
||||||
|
{
|
||||||
|
return (php_sapi_name() === 'cli');
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isRunningOnWindows()
|
||||||
|
{
|
||||||
|
return (PHP_OS == 'WINNT');
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getLineEnding()
|
||||||
|
{
|
||||||
|
return (static::isRunningFromCommandLine() ? PHP_EOL : '<br/>');
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getThemeList()
|
||||||
|
{
|
||||||
|
if (!empty(static::$themeList)) {
|
||||||
|
return static::$themeList;
|
||||||
|
}
|
||||||
|
|
||||||
|
$context = stream_context_create([
|
||||||
|
'http' => [
|
||||||
|
'method' => 'GET',
|
||||||
|
'header' => [
|
||||||
|
'User-Agent: PHP'
|
||||||
|
]
|
||||||
|
],
|
||||||
|
'ssl' => [
|
||||||
|
"verify_peer" => false,
|
||||||
|
"verify_peer_name" => false
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
|
||||||
|
$urlOfThemesDirFromGithubRepo = 'https://api.github.com/repos/vrana/adminer/contents/designs';
|
||||||
|
|
||||||
|
$jsonThemeList = file_get_contents($urlOfThemesDirFromGithubRepo, false, $context);
|
||||||
|
|
||||||
|
static::$themeList = ($jsonThemeList ? json_decode($jsonThemeList) : false);
|
||||||
|
|
||||||
|
return static::$themeList;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function downloadTheme($themeIndex = null)
|
||||||
|
{
|
||||||
|
if (is_null($themeIndex)) {
|
||||||
|
$themeIndex = static::$option;
|
||||||
|
}
|
||||||
|
|
||||||
|
$themeName = static::getThemeList()[$themeIndex]->name;
|
||||||
|
$urlOfCssFileFromGithubRepo = "https://raw.githubusercontent.com/vrana/adminer/master/designs/{$themeName}/adminer.css";
|
||||||
|
$cssContent = file_get_contents($urlOfCssFileFromGithubRepo);
|
||||||
|
$filePath = __DIR__ . '/adminer.css';
|
||||||
|
$fileExists = file_exists('adminer.css');
|
||||||
|
if (file_put_contents($filePath, $cssContent) !== false) {
|
||||||
|
if (!$fileExists) {
|
||||||
|
chmod($filePath, 0777);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function printListAvailableThemes()
|
||||||
|
{
|
||||||
|
echo "List of available Adminer Themes:" . static::getLineEnding() . static::getLineEnding();
|
||||||
|
|
||||||
|
if (static::getThemeList()) {
|
||||||
|
foreach (static::getThemeList() as $index => $theme) {
|
||||||
|
if ($theme->type !== 'dir') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "[{$index}] {$theme->name}" . static::getLineEnding();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
echo static::getLineEnding();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function readOptionFromCommandLine()
|
||||||
|
{
|
||||||
|
if (static::isRunningOnWindows()) {
|
||||||
|
echo static::$prompt;
|
||||||
|
static::$option = stream_get_line(STDIN, 1024, static::getLineEnding());
|
||||||
|
} else {
|
||||||
|
static::$option = readline(static::$prompt);
|
||||||
|
}
|
||||||
|
|
||||||
|
return static::$option;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function printResultOf($download)
|
||||||
|
{
|
||||||
|
if ($download) {
|
||||||
|
echo 'Theme switched successfully!' . static::getLineEnding();
|
||||||
|
} else {
|
||||||
|
echo 'Something went wrong with the download. Try again!' . static::getLineEnding();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function printJavascriptPrompt()
|
||||||
|
{
|
||||||
|
echo '<script>';
|
||||||
|
echo 'setTimeout(function() {';
|
||||||
|
echo 'var option = prompt("' . static::$prompt . '", "0");';
|
||||||
|
echo 'if (option !== null) { window.location.replace(window.location.href.split("?")[0] + "?option=" + option); }';
|
||||||
|
echo '}, 1000);';
|
||||||
|
echo '</script>';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function readOptionFromBrowser()
|
||||||
|
{
|
||||||
|
if (isset($_GET['option'])) {
|
||||||
|
static::$option = $_GET['option'];
|
||||||
|
}
|
||||||
|
|
||||||
|
return static::$option;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function hasNotSelectedAnOptionFromBrowserYet()
|
||||||
|
{
|
||||||
|
return !isset($_GET['option']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function hasSelectedAValidOption()
|
||||||
|
{
|
||||||
|
return is_numeric(static::$option) && static::$option < count(static::getThemeList());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function printInvalidOptionErrorMessage()
|
||||||
|
{
|
||||||
|
$errorMessage = static::$option . " is not a number from the options! Try again!";
|
||||||
|
|
||||||
|
if (static::isRunningFromCommandLine()) {
|
||||||
|
echo $errorMessage . static::getLineEnding();
|
||||||
|
static::run();
|
||||||
|
} else {
|
||||||
|
echo '<script>alert("' . $errorMessage . '")</script>';
|
||||||
|
echo '<script>window.location.replace(window.location.href.split("?")[0])</script>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function switchTheme()
|
||||||
|
{
|
||||||
|
if (static::hasSelectedAValidOption()) {
|
||||||
|
static::printResultOf(static::downloadTheme());
|
||||||
|
} else {
|
||||||
|
static::printInvalidOptionErrorMessage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AdminerThemeSwitcher::run();
|
||||||
|
|
@ -8,21 +8,23 @@ networks:
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
index_db:
|
index_db:
|
||||||
webdb_ssh:
|
adminer_plugins:
|
||||||
webdb_time_machine:
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
webdb:
|
adminer:
|
||||||
image: webdb/app
|
image: ghcr.io/shyim/adminerevo:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- default
|
- default
|
||||||
- reverse_proxy
|
- reverse_proxy
|
||||||
volumes:
|
volumes:
|
||||||
- "webdb_ssh:/root/.ssho"
|
- adminer_plugins:/var/www/html/plugins-custom
|
||||||
- "webdb_time_machine:/usr/src/app/static/version"
|
|
||||||
environment:
|
environment:
|
||||||
SCAN_HOSTS: db,tasks.db
|
ADMINER_DEFAULT_DRIVER: pgsql
|
||||||
|
ADMINER_DEFAULT_SERVER: tasks.db
|
||||||
|
ADMINER_DEFAULT_USER: postgres
|
||||||
|
ADMINER_PLUGINS: tables-filter tinymce edit-calendar edit-foreign enum-option enum-types file-upload slugify struct-comments
|
||||||
|
ADMINER_DESIGN: 'pepa-linha-dark'
|
||||||
deploy:
|
deploy:
|
||||||
rollback_config:
|
rollback_config:
|
||||||
failure_action: continue
|
failure_action: continue
|
||||||
|
|
@ -36,14 +38,11 @@ services:
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.http.routers.index.rule=Host(`index.alecodes.page`)
|
- traefik.http.routers.index.rule=Host(`index.alecodes.page`)
|
||||||
- traefik.http.services.index.loadbalancer.server.port=22071
|
- traefik.http.services.index.loadbalancer.server.port=8080
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres
|
image: postgres
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
|
||||||
- default
|
|
||||||
- reverse_proxy
|
|
||||||
secrets:
|
secrets:
|
||||||
- index_db_pass
|
- index_db_pass
|
||||||
volumes:
|
volumes:
|
||||||
|
|
@ -64,8 +63,3 @@ services:
|
||||||
placement:
|
placement:
|
||||||
constraints:
|
constraints:
|
||||||
- node.labels.services_kind==${SERVICE_KIND:-common}
|
- node.labels.services_kind==${SERVICE_KIND:-common}
|
||||||
labels:
|
|
||||||
- traefik.enable=true
|
|
||||||
- traefik.tcp.routers.index_db.entrypoints=postgres
|
|
||||||
- traefik.tcp.routers.index_db.rule=HostSNI(`*`)
|
|
||||||
- traefik.tcp.services.index_db.loadbalancer.server.port=5432
|
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
-- DB Version: 17
|
|
||||||
-- OS Type: linux
|
|
||||||
-- DB Type: web
|
|
||||||
-- Total Memory (RAM): 512 MB
|
|
||||||
-- Data Storage: hdd
|
|
||||||
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
max_connections = '200';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
shared_buffers = '128MB';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
effective_cache_size = '384MB';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
maintenance_work_mem = '32MB';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
checkpoint_completion_target = '0.9';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
wal_buffers = '3932kB';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
default_statistics_target = '100';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
random_page_cost = '4';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
effective_io_concurrency = '2';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
work_mem = '327kB';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
huge_pages = 'off';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
min_wal_size = '1GB';
|
|
||||||
ALTER SYSTEM SET
|
|
||||||
max_wal_size = '4GB';
|
|
||||||
|
|
@ -1,131 +0,0 @@
|
||||||
networks:
|
|
||||||
reverse_proxy:
|
|
||||||
external: true
|
|
||||||
|
|
||||||
configs:
|
|
||||||
lemmy_customPostgresql.sql:
|
|
||||||
external: true
|
|
||||||
|
|
||||||
secrets:
|
|
||||||
lemmy_lemmy.hjson:
|
|
||||||
external: true
|
|
||||||
lemmy_postgres_pass.txt:
|
|
||||||
external: true
|
|
||||||
lemmy_pictrs.toml:
|
|
||||||
external: true
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
ui_themes:
|
|
||||||
pictrs:
|
|
||||||
db:
|
|
||||||
|
|
||||||
services:
|
|
||||||
lemmy:
|
|
||||||
image: dessalines/lemmy:0.19.8
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- default
|
|
||||||
- reverse_proxy
|
|
||||||
environment:
|
|
||||||
- RUST_LOG="info"
|
|
||||||
secrets:
|
|
||||||
- source: lemmy_lemmy.hjson
|
|
||||||
target: /config/config.hjson
|
|
||||||
deploy:
|
|
||||||
rollback_config:
|
|
||||||
failure_action: continue
|
|
||||||
update_config:
|
|
||||||
delay: 2s
|
|
||||||
failure_action: rollback
|
|
||||||
order: start-first
|
|
||||||
placement:
|
|
||||||
constraints:
|
|
||||||
- node.labels.services_kind==${SERVICE_KIND:-common}
|
|
||||||
labels:
|
|
||||||
- traefik.enable=true
|
|
||||||
- traefik.http.routers.lemmy.rule=Host(`lemmy.alecodes.page`) && (PathRegexp(`^/(api|pictrs|feeds|nodeinfo|\\.well-known)`) || HeaderRegexp(`Accept`, `^application/.*`))
|
|
||||||
- traefik.http.services.lemmy.loadbalancer.server.port=8536
|
|
||||||
- traefik.http.middlewares.lemmy-max-bodysize.buffering.maxRequestBodyBytes=20971520 # 20M
|
|
||||||
- traefik.http.routers.lemmy.middlewares=lemmy-max-bodysize
|
|
||||||
|
|
||||||
lemmy_ui:
|
|
||||||
image: dessalines/lemmy-ui:0.19.8
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- default
|
|
||||||
- reverse_proxy
|
|
||||||
environment:
|
|
||||||
- LEMMY_UI_LEMMY_INTERNAL_HOST=tasks.lemmy:8536
|
|
||||||
- LEMMY_UI_LEMMY_EXTERNAL_HOST=lemmy.alecodes.page
|
|
||||||
- LEMMY_UI_HTTPS=true
|
|
||||||
volumes:
|
|
||||||
- ui_themes:/app/extra_themes
|
|
||||||
deploy:
|
|
||||||
rollback_config:
|
|
||||||
failure_action: continue
|
|
||||||
update_config:
|
|
||||||
delay: 2s
|
|
||||||
failure_action: rollback
|
|
||||||
order: start-first
|
|
||||||
placement:
|
|
||||||
constraints:
|
|
||||||
- node.labels.services_kind==${SERVICE_KIND:-common}
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.middlewares.lemmy-ui-client-max-bodysize.buffering.maxRequestBodyBytes=20971520" # 20M
|
|
||||||
- "traefik.http.routers.lemmy-ui.middlewares=lemmy-ui-client-max-bodysize"
|
|
||||||
- "traefik.http.routers.lemmy-ui.rule=Host(`lemmy.alecodes.page`)"
|
|
||||||
- "traefik.http.routers.lemmy-ui.service=lemmy-ui"
|
|
||||||
- "traefik.http.services.lemmy-ui.loadbalancer.server.port=1234"
|
|
||||||
|
|
||||||
- "traefik.http.routers.lemmy-security-txt.rule=Host(`lemmy.alecodes.page`) && Path(`/.well-known/security.txt`)"
|
|
||||||
- "traefik.http.routers.lemmy-security-txt.service=lemmy-security-txt"
|
|
||||||
- "traefik.http.services.lemmy-security-txt.loadbalancer.server.port=1234"
|
|
||||||
|
|
||||||
pictrs:
|
|
||||||
image: asonix/pictrs:0.5.16
|
|
||||||
restart: always
|
|
||||||
# this needs to match the pictrs url in lemmy_lemmy.hjson
|
|
||||||
entrypoint: /sbin/tini -- /usr/local/bin/pict-rs -c /run/secrets/lemmy_pictrs.toml run
|
|
||||||
secrets:
|
|
||||||
- lemmy_pictrs.toml
|
|
||||||
environment:
|
|
||||||
- RUST_BACKTRACE=full
|
|
||||||
user: 991:991
|
|
||||||
volumes:
|
|
||||||
- pictrs:/mnt:Z
|
|
||||||
deploy:
|
|
||||||
rollback_config:
|
|
||||||
failure_action: continue
|
|
||||||
update_config:
|
|
||||||
delay: 2s
|
|
||||||
failure_action: rollback
|
|
||||||
order: start-first
|
|
||||||
placement:
|
|
||||||
constraints:
|
|
||||||
- node.labels.services_kind==${SERVICE_KIND:-common}
|
|
||||||
|
|
||||||
lemmy_db:
|
|
||||||
image: pgautoupgrade/pgautoupgrade:17-bookworm
|
|
||||||
restart: always
|
|
||||||
secrets:
|
|
||||||
- lemmy_postgres_pass.txt
|
|
||||||
configs:
|
|
||||||
- source: lemmy_customPostgresql.sql
|
|
||||||
target: /docker-entrypoint-initdb.d/config.sql
|
|
||||||
environment:
|
|
||||||
- POSTGRES_USER=lemmy
|
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/lemmy_postgres_pass.txt
|
|
||||||
- POSTGRES_DB=lemmy
|
|
||||||
volumes:
|
|
||||||
- db:/var/lib/postgresql/data:Z
|
|
||||||
deploy:
|
|
||||||
rollback_config:
|
|
||||||
failure_action: continue
|
|
||||||
update_config:
|
|
||||||
delay: 2s
|
|
||||||
failure_action: rollback
|
|
||||||
order: start-first
|
|
||||||
placement:
|
|
||||||
constraints:
|
|
||||||
- node.labels.services_kind==${SERVICE_KIND:-common}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
# for more info about the config, check out the documentation
|
|
||||||
# https://join-lemmy.org/docs/en/administration/configuration.html
|
|
||||||
hostname: "lemmy.alecodes.page"
|
|
||||||
tls_enabled: true
|
|
||||||
database: {
|
|
||||||
host: "tasks.lemmy_db"
|
|
||||||
password: "529a6b836665075b535f8cc56d8f30cde7b7c9b01062feaa1b0da817fd7af2f8"
|
|
||||||
}
|
|
||||||
pictrs: {
|
|
||||||
url: "http://tasks.pictrs:8080/"
|
|
||||||
api_key: "529a6b836665075b535f8cc56d8f30cde7b7c9b01062feaa1b0da817fd7af2f8"
|
|
||||||
}
|
|
||||||
email: {
|
|
||||||
smtp_server: "smtp.gmail.com:587"
|
|
||||||
smtp_login: "ale.navarro.parra@gmail.com"
|
|
||||||
smtp_password: "steuuamhzngjgfwn"
|
|
||||||
smtp_from_address: "ale.navarro.parra@gmail.com"
|
|
||||||
tls_type: "starttls"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
[server]
|
|
||||||
api_key = '529a6b836665075b535f8cc56d8f30cde7b7c9b01062feaa1b0da817fd7af2f8'
|
|
||||||
|
|
||||||
[media.animation]
|
|
||||||
max_width = 256
|
|
||||||
max_height = 256
|
|
||||||
max_frame_count = 400
|
|
||||||
|
|
||||||
[media.video]
|
|
||||||
video_codec = 'vp9'
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
$ANSIBLE_VAULT;1.1;AES256
|
|
||||||
65343339376264393533303231656562316534643432643737653132646561316266386363376331
|
|
||||||
6137323165303633633535653537336436333834363564660a303934353533643965323636346536
|
|
||||||
38613331623336303130383261623162333437363830326434393463333564623032383434316130
|
|
||||||
6564646161353937320a666531326338663433326431346539346335346430653032643530386231
|
|
||||||
64636263343437333066323163336637386639643836336438663730623633633666383737353461
|
|
||||||
62656262626537303838613764366565393863393961373564343230363433343737303834353037
|
|
||||||
31653136323563333164303766636539313362363434336430303962653633316661623932396137
|
|
||||||
39353136643865303636
|
|
||||||
|
|
@ -3,55 +3,34 @@
|
||||||
- name: Deploy homelab services
|
- name: Deploy homelab services
|
||||||
hosts: 10.0.10.50
|
hosts: 10.0.10.50
|
||||||
tasks:
|
tasks:
|
||||||
# - name: Deploy RSS Services
|
- name: Deploy RSS Services
|
||||||
# vars:
|
|
||||||
# project_name: rss
|
|
||||||
# block:
|
|
||||||
# - name: Load environment variables
|
|
||||||
# include_vars:
|
|
||||||
# file: ../../files/docker/rss/env.yaml
|
|
||||||
# name: env_vars
|
|
||||||
#
|
|
||||||
# - name: Deploy RSS Feed
|
|
||||||
# environment: "{{ env_vars }}"
|
|
||||||
# community.docker.docker_stack:
|
|
||||||
# state: present
|
|
||||||
# prune: true
|
|
||||||
# name: "{{ project_name }}"
|
|
||||||
# compose:
|
|
||||||
# - "{{ lookup('file', '../../files/docker/rss/docker-stack.yaml') | from_yaml }}"
|
|
||||||
|
|
||||||
- name: Deploy Lemmy Services
|
|
||||||
vars:
|
vars:
|
||||||
project_name: lemmy
|
project_name: rss
|
||||||
block:
|
block:
|
||||||
- name: Create config
|
# - name: Generate random hash
|
||||||
loop:
|
# no_log: true
|
||||||
- customPostgresql.sql
|
# community.crypto.openssl_random:
|
||||||
community.docker.docker_config:
|
# length: 32
|
||||||
name: '{{ project_name + "_" + item }}'
|
# hex: false
|
||||||
data: "{{ lookup('file', '../../files/docker/lemmy/{{ item }}') | b64encode }}"
|
# register: random_hash
|
||||||
data_is_b64: true
|
#
|
||||||
state: present
|
# - name: Create Docker secret for PostgreSQL password
|
||||||
labels:
|
# no_log: true
|
||||||
com.docker.stack.namespace: "{{ project_name }}"
|
# community.docker.docker_secret:
|
||||||
- name: Create secrets
|
# state: present
|
||||||
loop:
|
# name: "{{ project_name + '_db_password'}}"
|
||||||
- lemmy.hjson
|
# secret: "{{ random_hash.stdout }}"
|
||||||
- postgres_pass.txt
|
|
||||||
- pictrs.toml
|
- name: Load environment variables
|
||||||
community.docker.docker_secret:
|
include_vars:
|
||||||
name: '{{ project_name + "_" + item }}'
|
file: ../../files/docker/rss/env.yaml
|
||||||
data: "{{ lookup('file', '../../files/docker/lemmy/{{ item }}') | b64encode }}"
|
name: env_vars
|
||||||
data_is_b64: true
|
|
||||||
state: present
|
- name: Deploy RSS Feed
|
||||||
labels:
|
environment: "{{ env_vars }}"
|
||||||
com.docker.stack.namespace: "{{ project_name }}"
|
|
||||||
- name: Deploy lemmy stack
|
|
||||||
# environment: "{{ lookup('ini', '../../files/docker/lemmy/.env') }}"
|
|
||||||
community.docker.docker_stack:
|
community.docker.docker_stack:
|
||||||
state: present
|
state: present
|
||||||
prune: true
|
prune: true
|
||||||
name: "{{ project_name }}"
|
name: "{{ project_name }}"
|
||||||
compose:
|
compose:
|
||||||
- "{{ lookup('file', '../../files/docker/lemmy/docker-stack.yaml') | from_yaml }}"
|
- "{{ lookup('file', '../../files/docker/rss/docker-stack.yaml') | from_yaml }}"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@
|
||||||
create_home: true
|
create_home: true
|
||||||
password: "{{ (item.value.password != '!' or item.value.password != '*') | ternary(item.value.password | password_hash('sha512'), item.value.password) }}"
|
password: "{{ (item.value.password != '!' or item.value.password != '*') | ternary(item.value.password | password_hash('sha512'), item.value.password) }}"
|
||||||
groups: "{{ item.value.groups + (extra_groups | default([])) }}"
|
groups: "{{ item.value.groups + (extra_groups | default([])) }}"
|
||||||
append: true
|
|
||||||
|
|
||||||
- name: Add SSH public key to users
|
- name: Add SSH public key to users
|
||||||
loop: "{{ users | dict2items }}"
|
loop: "{{ users | dict2items }}"
|
||||||
|
|
|
||||||
|
|
@ -49,10 +49,6 @@
|
||||||
published: 443
|
published: 443
|
||||||
protocol: tcp
|
protocol: tcp
|
||||||
mode: host
|
mode: host
|
||||||
- target: 5432
|
|
||||||
published: 5432
|
|
||||||
protocol: tcp
|
|
||||||
mode: host
|
|
||||||
- target: 8080
|
- target: 8080
|
||||||
published: 8080
|
published: 8080
|
||||||
protocol: tcp
|
protocol: tcp
|
||||||
|
|
@ -61,11 +57,9 @@
|
||||||
- '--api.dashboard=true'
|
- '--api.dashboard=true'
|
||||||
- '--api.insecure=true'
|
- '--api.insecure=true'
|
||||||
- '--entrypoints.http.address=:80'
|
- '--entrypoints.http.address=:80'
|
||||||
- '--entrypoints.http.asDefault=true'
|
|
||||||
- '--entryPoints.http.forwardedHeaders.trustedIPs=10.0.10.0/24'
|
- '--entryPoints.http.forwardedHeaders.trustedIPs=10.0.10.0/24'
|
||||||
- '--entrypoints.http.http.encodequerysemicolons=true'
|
- '--entrypoints.http.http.encodequerysemicolons=true'
|
||||||
- '--entryPoints.http.http2.maxConcurrentStreams=50'
|
- '--entryPoints.http.http2.maxConcurrentStreams=50'
|
||||||
- '--entrypoints.postgres.address=:5432'
|
|
||||||
- '--providers.swarm=true'
|
- '--providers.swarm=true'
|
||||||
- '--providers.swarm.endpoint=tcp://{{ ansible_default_ipv4.address }}:2375'
|
- '--providers.swarm.endpoint=tcp://{{ ansible_default_ipv4.address }}:2375'
|
||||||
- '--providers.swarm.exposedByDefault=false'
|
- '--providers.swarm.exposedByDefault=false'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue