From 43c18520bee878503af913a3fcd5909db10d23ab Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Fri, 22 Dec 2023 23:05:54 +0100 Subject: [PATCH] remove containers, add poddoc --- apps/init.sls | 1 + apps/poddoc/init.sls | 24 ++++++++++++ .../files/forgejo_docker-compose.yml.jinja | 24 ------------ .../files/mariadb_docker-compose.yml.jinja | 20 ---------- .../containers/files/npm_docker-compose.yml | 20 ---------- podman/containers/forgejo.sls | 30 --------------- podman/containers/init.sls | 4 -- podman/containers/map.jinja | 3 -- podman/containers/mariadb.sls | 31 ---------------- podman/containers/npm.sls | 37 ------------------- 10 files changed, 25 insertions(+), 169 deletions(-) create mode 100644 apps/poddoc/init.sls delete mode 100644 podman/containers/files/forgejo_docker-compose.yml.jinja delete mode 100644 podman/containers/files/mariadb_docker-compose.yml.jinja delete mode 100644 podman/containers/files/npm_docker-compose.yml delete mode 100644 podman/containers/forgejo.sls delete mode 100644 podman/containers/init.sls delete mode 100644 podman/containers/map.jinja delete mode 100644 podman/containers/mariadb.sls delete mode 100644 podman/containers/npm.sls diff --git a/apps/init.sls b/apps/init.sls index c89de02..f86dc97 100644 --- a/apps/init.sls +++ b/apps/init.sls @@ -1,3 +1,4 @@ include: - .noveriablcgen - .generate-motd + - .poddoc diff --git a/apps/poddoc/init.sls b/apps/poddoc/init.sls new file mode 100644 index 0000000..6137bfa --- /dev/null +++ b/apps/poddoc/init.sls @@ -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 diff --git a/podman/containers/files/forgejo_docker-compose.yml.jinja b/podman/containers/files/forgejo_docker-compose.yml.jinja deleted file mode 100644 index 43fa558..0000000 --- a/podman/containers/files/forgejo_docker-compose.yml.jinja +++ /dev/null @@ -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 diff --git a/podman/containers/files/mariadb_docker-compose.yml.jinja b/podman/containers/files/mariadb_docker-compose.yml.jinja deleted file mode 100644 index c6784aa..0000000 --- a/podman/containers/files/mariadb_docker-compose.yml.jinja +++ /dev/null @@ -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 diff --git a/podman/containers/files/npm_docker-compose.yml b/podman/containers/files/npm_docker-compose.yml deleted file mode 100644 index 8356987..0000000 --- a/podman/containers/files/npm_docker-compose.yml +++ /dev/null @@ -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 : - - '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 diff --git a/podman/containers/forgejo.sls b/podman/containers/forgejo.sls deleted file mode 100644 index c191085..0000000 --- a/podman/containers/forgejo.sls +++ /dev/null @@ -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 diff --git a/podman/containers/init.sls b/podman/containers/init.sls deleted file mode 100644 index 3c98871..0000000 --- a/podman/containers/init.sls +++ /dev/null @@ -1,4 +0,0 @@ -include: - - .npm - - .mariadb - - .forgejo diff --git a/podman/containers/map.jinja b/podman/containers/map.jinja deleted file mode 100644 index 962a5a3..0000000 --- a/podman/containers/map.jinja +++ /dev/null @@ -1,3 +0,0 @@ -{% set containers = { - 'podman_dir': '/opt/podman' -} %} diff --git a/podman/containers/mariadb.sls b/podman/containers/mariadb.sls deleted file mode 100644 index adc6e26..0000000 --- a/podman/containers/mariadb.sls +++ /dev/null @@ -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 diff --git a/podman/containers/npm.sls b/podman/containers/npm.sls deleted file mode 100644 index 1ce52fa..0000000 --- a/podman/containers/npm.sls +++ /dev/null @@ -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