diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5546462..464fc42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,6 @@ image: rehashedsalt/ansible-env:bleeding variables: ANSIBLE_INVENTORY: inventories/production-no-auto ANSIBLE_STRATEGY: free - ARA_API_CLIENT: http - ARA_API_SERVER: "https://ara.desu.ltd" stages: - lint - test @@ -33,8 +31,6 @@ before_script: zerotier-cli listnetworks # Get ready for execution - ansible-galaxy install -r requirements.yml - # Set up our callback plugins - - source <(python3 -m ara.setup.env) # Run a quick test SSH connection to the bastion box - ssh -o StrictHostKeyChecking=no ansible@bastion1.dallas.mgmt.desu.ltd uptime # And a quick test SSH connection over proxy diff --git a/README.md b/README.md index 9237fa8..b68616f 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,6 @@ Useful for management across all of 9iron, thefuck, and desu. For quick bootstrapping of tools and libraries used in this repo, see [rehashedsalt/ansible-env](https://gitlab.com/rehashedsalt/docker-ansible-env). I use that exact image for CI/CD. -I use ara to record Ansible plays. If your environment has it installed, source the script in `contrib/ara.sh` to configure your environment properly. - ## Deployment ### Linux Machines diff --git a/contrib/ara.sh b/contrib/ara.sh deleted file mode 100755 index 61f6b81..0000000 --- a/contrib/ara.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash -# -# ara.sh -# Copyright (C) 2022 Vintage Salt -# -# Distributed under terms of the MIT license. -# - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - echo "Source this script, don't execute it" - echo " source \"${0}\"" - exit 1 -fi -ara="$(python3 -m ara.setup.callback_plugins)" -if [ -n "$ara" ]; then - export ANSIBLE_CALLBACK_PLUGINS="$ara" - export ARA_API_CLIENT="http" - export ARA_API_SERVER="https://ara.desu.ltd" - echo "Ansible configured to report to ara at $ARA_API_SERVER" -else - echo "Unable to find ara; is it installed?" -fi -unset ara diff --git a/playbooks/local_dns.yml b/playbooks/local_dns.yml index 1664a3a..cf3fe05 100755 --- a/playbooks/local_dns.yml +++ b/playbooks/local_dns.yml @@ -91,8 +91,6 @@ value: [ "{{ item.value }}" ] with_items: # Public - - record: ara.desu.ltd - value: vm-general-1.ashburn.mgmt.desu.ltd - record: firefly.desu.ltd value: vm-general-1.ashburn.mgmt.desu.ltd - record: firefly-importer.desu.ltd diff --git a/playbooks/prod_web.yml b/playbooks/prod_web.yml index 755350d..1451954 100755 --- a/playbooks/prod_web.yml +++ b/playbooks/prod_web.yml @@ -20,7 +20,6 @@ - app/redis.yml - app/vaultwarden.yml - web/9iron.yml - - web/ara.yml - web/desultd.yml - web/element-web.yml - web/firefly-iii.yml @@ -225,8 +224,6 @@ vars: ingress_servers: # desu.ltd - - name: ara.desu.ltd - proxy_pass: http://ara:8000 - name: desu.ltd proxy_pass: http://desultd:80 locations: diff --git a/playbooks/tasks/web/ara.yml b/playbooks/tasks/web/ara.yml deleted file mode 100644 index 1cb6674..0000000 --- a/playbooks/tasks/web/ara.yml +++ /dev/null @@ -1,20 +0,0 @@ -# vim:ft=ansible: -- name: docker deploy ara - docker_container: - name: ara - image: recordsansible/ara-api:centos8-stream-pypi-latest - env: - ARA_ALLOWED_HOSTS: "['ara.desu.ltd']" - ARA_DATABASE_ENGINE: django.db.backends.postgresql - ARA_DATABASE_NAME: ara-desultd - ARA_DATABASE_USER: ara-desultd - ARA_DATABASE_PASSWORD: "{{ secret_ara_db_pass }}" - ARA_DATABASE_HOST: 10.0.0.2 - networks: - - name: web - aliases: [ "ara" ] - volumes: - - /data/ara/server:/opt/ara:z - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - tags: [ docker, ara ] diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml index 84adef1..1490f8a 100644 --- a/roles/ansible/tasks/main.yml +++ b/roles/ansible/tasks/main.yml @@ -1,4 +1,4 @@ #!/usr/bin/env ansible-playbook # vim:ft=ansible: - name: install ansible - pip: name=ansible<5,ansible-lint,ara state=latest + pip: name=ansible<5,ansible-lint state=latest