diff --git a/setups/setup-4get.yml b/config-tasks/4get.yml similarity index 82% rename from setups/setup-4get.yml rename to config-tasks/4get.yml index 99c9785..3361acb 100644 --- a/setups/setup-4get.yml +++ b/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" diff --git a/setups/setup-anonymousoverflow.yml b/config-tasks/anonymousoverflow.yml similarity index 100% rename from setups/setup-anonymousoverflow.yml rename to config-tasks/anonymousoverflow.yml diff --git a/setups/setup-authelia.yml b/config-tasks/authelia.yml similarity index 100% rename from setups/setup-authelia.yml rename to config-tasks/authelia.yml diff --git a/setups/setup-breezewiki.yml b/config-tasks/breezewiki.yml similarity index 81% rename from setups/setup-breezewiki.yml rename to config-tasks/breezewiki.yml index 1417dbf..98e7bff 100644 --- a/setups/setup-breezewiki.yml +++ b/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" diff --git a/setups/setup-caddy.yml b/config-tasks/caddy.yml similarity index 100% rename from setups/setup-caddy.yml rename to config-tasks/caddy.yml diff --git a/setups/setup-firefox.yml b/config-tasks/firefox.yml similarity index 100% rename from setups/setup-firefox.yml rename to config-tasks/firefox.yml diff --git a/setups/setup-gitea-netrc.yml b/config-tasks/gitea-netrc.yml similarity index 90% rename from setups/setup-gitea-netrc.yml rename to config-tasks/gitea-netrc.yml index 8fe0c49..9908d62 100644 --- a/setups/setup-gitea-netrc.yml +++ b/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" diff --git a/setups/setup-gitea.yml b/config-tasks/gitea.yml similarity index 100% rename from setups/setup-gitea.yml rename to config-tasks/gitea.yml diff --git a/setups/setup-nitter.yml b/config-tasks/nitter.yml similarity index 100% rename from setups/setup-nitter.yml rename to config-tasks/nitter.yml diff --git a/setups/setup-paulgo.yml b/config-tasks/paulgo.yml similarity index 100% rename from setups/setup-paulgo.yml rename to config-tasks/paulgo.yml diff --git a/setups/setup-runner.yml b/config-tasks/runner.yml similarity index 94% rename from setups/setup-runner.yml rename to config-tasks/runner.yml index 51b5cca..7a6d3e9 100644 --- a/setups/setup-runner.yml +++ b/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" diff --git a/setups/setup-scribe.yml b/config-tasks/scribe.yml similarity index 100% rename from setups/setup-scribe.yml rename to config-tasks/scribe.yml diff --git a/deploy.yml b/deploy.yml index 7d2d2df..80539eb 100644 --- a/deploy.yml +++ b/deploy.yml @@ -36,10 +36,10 @@ loop: "{{ compose[inventory_hostname] }}" when: compose is defined and inventory_hostname in compose - - name: Inital Setup - include_tasks: "setups/setup-{{ item }}.yml" - loop: "{{ setup[inventory_hostname] }}" - when: setup is defined and inventory_hostname in setup + - name: Inital configurations + include_tasks: "config-tasks/{{ item }}.yml" + loop: "{{ config[inventory_hostname] }}" + when: config is defined and inventory_hostname in config ignore_errors: yes - name: Copy Docker Compose diff --git a/staging b/staging new file mode 100644 index 0000000..9e16310 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/templates/compose/privatebin.yaml.j2 b/templates/compose/privatebin.yaml.j2 index 79b00cf..72d7aac 100644 --- a/templates/compose/privatebin.yaml.j2 +++ b/templates/compose/privatebin.yaml.j2 @@ -20,4 +20,4 @@ networks: privatebin: name: privatebin -# sudo chown 65534:82 {{ docker_dir }}/privatebin/data \ No newline at end of file +# sudo chown -R 65534:82 {{ docker_dir }}/privatebin/data \ No newline at end of file diff --git a/templates/conf/settings.yml.j2 b/templates/conf/settings.yml.j2 index 56e9580..0e60992 100755 --- a/templates/conf/settings.yml.j2 +++ b/templates/conf/settings.yml.j2 @@ -1886,6 +1886,7 @@ engines: - name: yahoo engine: yahoo shortcut: yh + disabled: true - name: yahoo news engine: yahoo_news diff --git a/vars/secrets.example.yml b/vars/secrets.example.yml new file mode 100644 index 0000000..64b8c56 --- /dev/null +++ b/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: \ No newline at end of file diff --git a/vars/services.yml b/vars/services.yml index b86e3c2..53b197d 100644 --- a/vars/services.yml +++ b/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