Fixed config-tasks

config-tasks/4get.yml

@@ -1,4 +1,4 @@
-    - name: Setup config.php.j2
+    - name: Set up config.php.j2
       template:
         src: "conf/config.php.j2"
         dest: "{{ docker_dir }}/4get/config.php"

config-tasks/breezewiki.yml

@@ -1,4 +1,4 @@
-    - name: Setup breezewiki config
+    - name: Set up breezewiki config
       template:
         src: "conf/config.ini.j2"
         dest: "{{ docker_dir }}/breezewiki/config.ini.j2"

config-tasks/gitea-netrc.yml

@@ -1,3 +1,6 @@
+# ----------------------------------------------------------------------------------------------------
+# Store git credentials with GPG and .netrc because SSH is too complicated for Gitea on Docker
+
     - name: Remove existing .netrc
       file:
         path: "/home/{{ control_user }}/.netrc"

config-tasks/runner.yml

@@ -1,4 +1,4 @@
-    - name: Setup runner.j2
+    - name: Set up runner.j2
       template:
         src: "conf/runner.j2"
         dest: "{{ docker_dir }}/runner/.runner"

deploy.yml

@@ -36,10 +36,10 @@
       loop: "{{ compose[inventory_hostname] }}"
       when: compose is defined and inventory_hostname in compose
 
-    - name: Inital Setup
+    - name: Inital configurations
-      include_tasks: "setups/setup-{{ item }}.yml"
+      include_tasks: "config-tasks/{{ item }}.yml"
-      loop: "{{ setup[inventory_hostname] }}"
+      loop: "{{ config[inventory_hostname] }}"
-      when: setup is defined and inventory_hostname in setup
+      when: config is defined and inventory_hostname in config
       ignore_errors: yes
 
     - name: Copy Docker Compose

staging

@@ -0,0 +1,29 @@
+oracle:
+  hosts:
+    oracle1:
+      ansible_host: [REDACTED]
+    oracle2:
+      ansible_host: [REDACTED]
+    oracle3:
+      ansible_host: [REDACTED]
+    oracle4:
+      ansible_host: [REDACTED]
+  vars:
+    ansible_ssh_private_key_file: [REDACTED]
+    ansible_user: [REDACTED]
+    ansible_ssh_port: [REDACTED]
+    ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
+    TZ: Asia/Singapore
+
+# ----------------------------------------------------------------------------------------------------
+
+cloudcompute:
+  hosts:
+    vultr:
+      ansible_host: [REDACTED]
+  vars:
+    ansible_ssh_private_key_file: [REDACTED]
+    ansible_user: [REDACTED]
+    ansible_ssh_port: [REDACTED]
+    ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
+    TZ: Asia/Singapore

templates/compose/privatebin.yaml.j2

@@ -20,4 +20,4 @@ networks:
   privatebin:
     name: privatebin
 
-# sudo chown 65534:82 {{ docker_dir }}/privatebin/data
+# sudo chown -R 65534:82 {{ docker_dir }}/privatebin/data

templates/conf/settings.yml.j2

@@ -1886,6 +1886,7 @@ engines:
   - name: yahoo
     engine: yahoo
     shortcut: yh
+    disabled: true
 
   - name: yahoo news
     engine: yahoo_news

vars/secrets.example.yml

@@ -0,0 +1,42 @@
+docker_dir:
+control_user:
+control_host:
+
+backup_zip_password:
+backup_path_on_control_host:
+oracle1_nfs_docker_dir_on_control_host:
+oracle2_nfs_docker_dir_on_control_host:
+oracle3_nfs_docker_dir_on_control_host:
+oracle4_nfs_docker_dir_on_control_host:
+
+vultr_private_ip:
+oracle1_private_ip:
+oracle2_private_ip:
+oracle3_private_ip:
+oracle4_private_ip:
+
+authelia_encryption_key:
+authelia_user:
+authelia_password:
+
+geoipupdate_account_id:
+geoipupdate_license_key:
+
+etherpad_db_user:
+etherpad_db_pass:
+etherpad_admin_password:
+
+cloudflare_api_token:
+allow_countries: 
+twitterminator_url:
+
+gitea_access_token:
+gitea_database_user:
+gitea_database_passwd:
+gitea_database_name:
+docker_host:
+
+gitea_runner_registration_token:
+runner_uuid:
+runner_token:
+runner_id:

vars/services.yml

@@ -1,10 +1,11 @@
 compose:
   oracle4:
-    - paulgo 
+    - paulgo
 
-setup:
+config:
   oracle4:
     - paulgo
+
 # ----------------------------------------------------------------------------------------------------
 
 deployed-compose:
@@ -121,7 +122,7 @@ deployed-compose:
 
 # ----------------------------------------------------------------------------------------------------
 
-deployed-setup:
+deployed-config:
   oracle1:
     - 4get
     - anonymousoverflow