diff --git a/Taskfile.yml b/Taskfile.yml index 10a8516..97c0f02 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -7,70 +7,24 @@ vars: sh: 'id -u' GROUP_ID: sh: 'id -g' - HOSTS_FILE: 'ansible/hosts_prod' - REMOTE_USER: 'major' + HOSTS_FILE: 'production.yml' + REMOTE_USER: + sh: 'yq .ungrouped.hosts.server.ansible_user {{.HOSTS_FILE}}' REMOTE_HOST: - sh: 'cat {{.HOSTS_FILE}} | xargs' + sh: 'yq .ungrouped.hosts.server.ansible_host {{.HOSTS_FILE}}' tasks: ssh: cmds: - - ssh {{.REMOTE_USER}}@{{.REMOTE_HOST}} + - ssh {{.REMOTE_USER}}@{{.REMOTE_HOST}} edit-vars: cmds: - - ansible-vault edit ansible/vars/vars.yml + - ansible-vault edit vars/vars.yml env: EDITOR: micro - list-tags: - cmds: - - >- - ansible-playbook - --inventory="{{.HOSTS_FILE}}" - --list-tags - ansible/configuration.yml - - configure: - internal: true - vars: - TAGS: '{{ (empty .TAGS) | ternary "" (list "--tags=\"" .TAGS "\"" | join "") }}' - cmds: - - >- - ansible-playbook - --become - --user="{{.REMOTE_USER}}" - --inventory="{{.HOSTS_FILE}}" - --extra-vars="ansible_python_interpreter=/usr/bin/python3" - {{.TAGS}} - ansible/configuration.yml - - configure-all: - cmds: - - task: configure - - configure-monitoring: - cmds: - - task: configure - vars: { TAGS: 'monitoring' } - - configure-apps: - cmds: - - task: configure - vars: { TAGS: 'webserver,apps,env' } - - configure-users: - cmds: - - task: configure - vars: { TAGS: 'apps,env' } - format-py-files: cmds: - - >- - docker run - --rm - -u {{.USER_ID}}:{{.GROUP_ID}} - -v $PWD:/app - -w /app - pyfound/black:latest_release - black . + - >- + docker run --rm -u {{.USER_ID}}:{{.GROUP_ID}} -v $PWD:/app -w /app pyfound/black:latest_release black . diff --git a/hosts_prod b/hosts_prod deleted file mode 100644 index 93da2ca..0000000 --- a/hosts_prod +++ /dev/null @@ -1 +0,0 @@ -158.160.46.255 diff --git a/playbook-system.yml b/playbook-system.yml index 8178b58..1ae7a9e 100644 --- a/playbook-system.yml +++ b/playbook-system.yml @@ -10,6 +10,7 @@ apt_packages: - acl - git + - htop - python3-pip tasks: diff --git a/production.yml b/production.yml new file mode 100644 index 0000000..fe26f15 --- /dev/null +++ b/production.yml @@ -0,0 +1,7 @@ +--- +ungrouped: + hosts: + server: + ansible_host: '158.160.46.255' + ansible_user: 'major' + ansible_become: true diff --git a/tasks.py b/tasks.py index d9e1e1e..7209238 100644 --- a/tasks.py +++ b/tasks.py @@ -53,7 +53,5 @@ def deploy(app_name: str, compose_file="docker-compose.yml", dirs=None): c.run( f"docker compose --project-name {shlex.quote(app_name)} --env-file=.env.prod up --detach --remove-orphans" ) - c.run( - f"docker system prune --all --volumes --force" - ) + c.run(f"docker system prune --all --volumes --force") print("Done.")