playbooks/configure-webproxy.yml

@@ -23,7 +23,7 @@
 - name: Configure Nginx
   hosts: jupiter
   vars_files:
-    - vars/applications.yaml
+    - vars/applications.yml
   vars:
     _letsencrypt_cert_dir: /etc/letsencrypt/live
   handlers:

playbooks/deploy-compose.yml

@@ -9,7 +9,7 @@
       prompt: Enter name of application stack to deploy
       private: false
   vars_files:
-    - vars/applications.yaml
+    - vars/applications.yml
   tasks:
     - name: Validate user input
       assert:
@@ -26,7 +26,7 @@
 - name: Build image
   hosts: virtualization
   vars_files:
-    - vars/applications.yaml
+    - vars/applications.yml
   tasks:
     - import_tasks: tasks/docker/build.yml
 
@@ -34,8 +34,8 @@
 - name: Configure datastore
   hosts: jupiter
   vars_files:
-    - vars/applications.yaml
+    - vars/applications.yml
-    - vars/secrets/applications.yaml
+    - vars/secrets/applications.yml
   tasks:
     - name: Create application datastore directory
       become: true
@@ -50,8 +50,8 @@
 - name: Configure docker stack
   hosts: jupiter
   vars_files:
-    - vars/applications.yaml
+    - vars/applications.yml
-    - vars/secrets/applications.yaml
+    - vars/secrets/applications.yml
   tasks:
     - name: Create compose configuration directory
       become: true

resources/docker-compose/scipio.yaml.j2

@@ -2,15 +2,6 @@
 version: "{{ omni_compose_version | string }}"
 
 
-x-global-env: &globalenv
-  SCIPIO_DB_BACKEND: MARIA
-  SCIPIO_DB_HOST: database
-  SCIPIO_DB_PORT: "3306"
-  SCIPIO_DB_USERNAME: root
-  SCIPIO_DB_PASSWORD: {{ omni_compose_app_secrets.scipio.database_password }}
-  SCIPIO_DB_SCHEMA: scipio
-
-
 networks:
   scipio:
     name: scipio
@@ -33,11 +24,6 @@ services:
     hostname: scipio-database
     networks:
       - scipio
-    ports:
-      - published: {{ omni_compose_apps.scipio.published.ports.3306 }}
-        target: 3306
-        protocol: tcp
-        mode: ingress
     volumes:
       - type: volume
         source: scipio
@@ -75,41 +61,15 @@ services:
     networks:
       - scipio
     environment:
-      <<: *globalenv
+      SCIPIO_INTERVAL: "30"
-      SCIPIO_INTERVAL: "10"
+      SCIPIO_DB_BACKEND: MARIA
+      SCIPIO_DB_HOST: database
+      SCIPIO_DB_PORT: "3306"
+      SCIPIO_DB_USERNAME: root
+      SCIPIO_DB_PASSWORD: {{ omni_compose_app_secrets.scipio.database_password }}
+      SCIPIO_DB_SCHEMA: scipio
       SCIPIO_PHANTOM_FEED: https://blog.tipranks.com/feed/
       SCIPIO_PHANTOM_HANDLER: tipranks
-    command: --phantom
+    command: --phantom -vv
-    deploy:
-      replicas: 1
-
-  executor:
-    image: scipio:{{ omni_compose_apps.scipio.versions.executor | default(omni_compose_apps.scipio.versions.default) }}
-    hostname: scipio-executor
-    depends_on:
-      - database
-      - phantom
-    networks:
-      - scipio
-    environment:
-      <<: *globalenv
-      SCIPIO_INTERVAL: "5"
-      SCIPIO_EXECUTOR_HANDLER: hologram
-    command: --executor
-    deploy:
-      replicas: 1
-
-  falcon:
-    image: scipio:{{ omni_compose_apps.scipio.versions.falcon | default(omni_compose_apps.scipio.versions.default) }}
-    hostname: scipio-falcon
-    depends_on:
-      - database
-      - executor
-    networks:
-      - scipio
-    environment:
-      <<: *globalenv
-      SCIPIO_INTERVAL: "60"
-    command: --falcon
     deploy:
       replicas: 1

vars/applications.yml

@@ -2,7 +2,6 @@
 omni_compose_version: 3.7
 
 omni_compose_apps:
-
   bitwarden:
     datastore: /appdata/bitwarden
     account:
@@ -20,7 +19,6 @@ omni_compose_apps:
       default: 1.36.1
       web: 2.15.1
       attachments: 1.34.0
-
   gitea:
     datastore: /appdata/gitea
     account:
@@ -35,7 +33,6 @@ omni_compose_apps:
       main: 192.168.103.0/24
     versions:
       default: 1.11.5
-
   minecraft:
     datastore: /appdata/minecraft
     account:
@@ -49,7 +46,6 @@ omni_compose_apps:
     versions:
       main: latest
       server: 1.15.2
-
   plex:
     datastore: /appdata/plex
     account:
@@ -70,7 +66,6 @@ omni_compose_apps:
       main: 192.168.101.0/24
     versions:
       default: latest
-
   unifi:
     datastore: /appdata/unifi
     account:
@@ -89,11 +84,10 @@ omni_compose_apps:
       main: 192.168.100.0/24
     versions:
       default: "5.12"
-
   scipio:
     build:
       repository: git@github.com:tjyork/Scipio.git
-      version: 0.5.2
+      version: 0.2.3
     datastore: /appdata/scipio
     account:
       name: mech_scipio
@@ -102,10 +96,9 @@ omni_compose_apps:
       host: scipio.net.enp.one
       ports:
         8080: 8081
-        3306: 33306
     networks:
       main: 192.168.106.0/24
     versions:
-      default: 0.5.2
+      default: latest
       database: "10"
-      dashboard: latest
+      phantom: 0.2.3

vars/secrets

@@ -1 +1 @@
-Subproject commit a6d05271693459972cc749ab6024d797b9904ee1
+Subproject commit 13a35d8e308ef8053b3d3031371e389f9e440a14