remove containers, add poddoc
This commit is contained in:
parent
596ecf346f
commit
43c18520be
10 changed files with 25 additions and 169 deletions
|
@ -1,3 +1,4 @@
|
||||||
include:
|
include:
|
||||||
- .noveriablcgen
|
- .noveriablcgen
|
||||||
- .generate-motd
|
- .generate-motd
|
||||||
|
- .poddoc
|
||||||
|
|
24
apps/poddoc/init.sls
Normal file
24
apps/poddoc/init.sls
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
include:
|
||||||
|
- system.base
|
||||||
|
|
||||||
|
{% from "map.jinja" import noveria %}
|
||||||
|
|
||||||
|
apps_poddoc_git:
|
||||||
|
git.latest:
|
||||||
|
- name: https://git.noveria.org/Tools/poddoc.git
|
||||||
|
- target: {{ noveria.app_dir }}/poddoc
|
||||||
|
- user: root
|
||||||
|
- force_reset: True
|
||||||
|
- require:
|
||||||
|
- system_base_apps_dir
|
||||||
|
|
||||||
|
apps_poddoc_link:
|
||||||
|
file.symlink:
|
||||||
|
- name: {{ noveria.bin_dir }}/poddoc
|
||||||
|
- target: {{ noveria.app_dir }}/poddoc/poddoc
|
||||||
|
- user: root
|
||||||
|
- group: root
|
||||||
|
- mode: '0755'
|
||||||
|
- require:
|
||||||
|
- system_base_bin_dir
|
||||||
|
- apps_poddoc_git
|
|
@ -1,24 +0,0 @@
|
||||||
version: '3'
|
|
||||||
|
|
||||||
services:
|
|
||||||
forgejo_server:
|
|
||||||
image: codeberg.org/forgejo/forgejo:1.20
|
|
||||||
container_name: forgejo
|
|
||||||
environment:
|
|
||||||
- USER_UID=1000
|
|
||||||
- USER_GID=1000
|
|
||||||
- FORGEJO__database__DB_TYPE=mysql
|
|
||||||
- FORGEJO__database__HOST=noveria_db:3306
|
|
||||||
- FORGEJO__database__NAME=forgejo
|
|
||||||
- FORGEJO__database__USER={{ MARIADB_USER }}
|
|
||||||
- FORGEJO__database__PASSWD={{ MARIADB_USER_PASSWORD }}
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- ./data:/data
|
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
|
|
||||||
networks:
|
|
||||||
default:
|
|
||||||
external: true
|
|
||||||
name: noveria
|
|
|
@ -1,20 +0,0 @@
|
||||||
version: '3.1'
|
|
||||||
services:
|
|
||||||
noveria_db:
|
|
||||||
image: docker.io/mariadb:lts
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
MARIADB_ROOT_PASSWORD: {{ MARIADB_ROOT_PASSWORD }}
|
|
||||||
MARIADB_USER: {{ MARIADB_USER }}
|
|
||||||
MARIADB_USER_PASSWORD: {{ MARIADB_USER_PASSWORD }}
|
|
||||||
volumes:
|
|
||||||
- ./data:/var/lib/mysql
|
|
||||||
|
|
||||||
adminer_ui:
|
|
||||||
image: docker.io/adminer
|
|
||||||
restart: always
|
|
||||||
|
|
||||||
networks:
|
|
||||||
default:
|
|
||||||
external: true
|
|
||||||
name: noveria
|
|
|
@ -1,20 +0,0 @@
|
||||||
version: '3.8'
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
image: docker.io/jc21/nginx-proxy-manager:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
# These ports are in format <host-port>:<container-port>
|
|
||||||
- '80:80' # Public HTTP Port
|
|
||||||
- '443:443' # Public HTTPS Port
|
|
||||||
- '81:81' # Admin Web Port
|
|
||||||
environment:
|
|
||||||
DISABLE_IPV6: 'true'
|
|
||||||
volumes:
|
|
||||||
- ./data:/data
|
|
||||||
- ./letsencrypt:/etc/letsencrypt
|
|
||||||
|
|
||||||
networks:
|
|
||||||
default:
|
|
||||||
external: true
|
|
||||||
name: noveria
|
|
|
@ -1,30 +0,0 @@
|
||||||
{% from tpldir+"/map.jinja" import containers %}
|
|
||||||
|
|
||||||
include:
|
|
||||||
- podman.directory
|
|
||||||
|
|
||||||
podman_containers_forgejo_compose:
|
|
||||||
file.managed:
|
|
||||||
- name: {{ containers.podman_dir }}/forgejo/docker-compose.yml
|
|
||||||
- source: salt://{{ tpldir }}/files/forgejo_docker-compose.yml.jinja
|
|
||||||
- template: jinja
|
|
||||||
- context:
|
|
||||||
MARIADB_USER: {{ salt['pillar.get']('podman:containers:mariadb:user') }}
|
|
||||||
MARIADB_USER_PASSWORD: {{ salt['pillar.get']('podman:containers:mariadb:userpwd') }}
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
||||||
|
|
||||||
podman_containers_forgejo_data_dir:
|
|
||||||
file.directory:
|
|
||||||
- name: {{ containers.podman_dir }}/forgejo/data
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- dir_mode: '0755'
|
|
||||||
- file_mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
|
@ -1,4 +0,0 @@
|
||||||
include:
|
|
||||||
- .npm
|
|
||||||
- .mariadb
|
|
||||||
- .forgejo
|
|
|
@ -1,3 +0,0 @@
|
||||||
{% set containers = {
|
|
||||||
'podman_dir': '/opt/podman'
|
|
||||||
} %}
|
|
|
@ -1,31 +0,0 @@
|
||||||
{% from tpldir+"/map.jinja" import containers %}
|
|
||||||
|
|
||||||
include:
|
|
||||||
- podman.directory
|
|
||||||
|
|
||||||
podman_containers_mariadb_compose:
|
|
||||||
file.managed:
|
|
||||||
- name: {{ containers.podman_dir }}/mariadb/docker-compose.yml
|
|
||||||
- source: salt://{{ tpldir }}/files/mariadb_docker-compose.yml.jinja
|
|
||||||
- template: jinja
|
|
||||||
- context:
|
|
||||||
MARIADB_ROOT_PASSWORD: {{ salt['pillar.get']('podman:containers:mariadb:rootpwd') }}
|
|
||||||
MARIADB_USER: {{ salt['pillar.get']('podman:containers:mariadb:user') }}
|
|
||||||
MARIADB_USER_PASSWORD: {{ salt['pillar.get']('podman:containers:mariadb:userpwd') }}
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
||||||
|
|
||||||
podman_containers_mariadb_data_dir:
|
|
||||||
file.directory:
|
|
||||||
- name: {{ containers.podman_dir }}/mariadb/data
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- dir_mode: '0755'
|
|
||||||
- file_mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
|
@ -1,37 +0,0 @@
|
||||||
{% from tpldir+"/map.jinja" import containers %}
|
|
||||||
|
|
||||||
include:
|
|
||||||
- podman.directory
|
|
||||||
|
|
||||||
podman_containers_npm_compose:
|
|
||||||
file.managed:
|
|
||||||
- name: {{ containers.podman_dir }}/npm/docker-compose.yml
|
|
||||||
- source: salt://{{ tpldir }}/files/npm_docker-compose.yml
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
||||||
|
|
||||||
podman_containers_npm_data_dir:
|
|
||||||
file.directory:
|
|
||||||
- name: {{ containers.podman_dir }}/npm/data
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- dir_mode: '0755'
|
|
||||||
- file_mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
||||||
|
|
||||||
podman_containers_npm_letsencrypt_dir:
|
|
||||||
file.directory:
|
|
||||||
- name: {{ containers.podman_dir }}/npm/letsencrypt
|
|
||||||
- user: puser
|
|
||||||
- group: puser
|
|
||||||
- dir_mode: '0755'
|
|
||||||
- file_mode: '0644'
|
|
||||||
- makedirs: True
|
|
||||||
- require:
|
|
||||||
- podman_directory_permissions
|
|
Loading…
Reference in a new issue