public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rearranging ansible directory

Browse source
This commit is contained in:
Samuel Clay 2021-02-23 19:13:54 -05:00
parent 8c64962999
commit 0c4464636f
6 changed files with 23 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ansible/common.yml
View file

@ -1,11 +0,0 @@
---
- hosts: all
vars:
- update_apt_cache: yes
vars_files:
- env_vars/base.yml
- env_vars/dev.yml
roles:
- base
- docker

2
ansible/deploy_app.yml
View file

@ -18,4 +18,4 @@
- name: Reload gunicorn
become: yes
command: "docker kill --signal=HUP newsblur_web"
when: pulled.changed
when: pulled.changed and "app" in inventory_hostname

0
ansible/.gitignore → ansible/inventories/.gitignore vendored
View file

0
ansible/check_droplet.py → ansible/utils/check_droplet.py
View file

0
ansible/generate.py → ansible/utils/generate.py
View file

44
terraform/digitalocean.tf
View file

@ -34,7 +34,7 @@ resource "digitalocean_droplet" "db-consul" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -51,7 +51,7 @@ resource "digitalocean_droplet" "www" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -69,7 +69,7 @@ resource "digitalocean_droplet" "app-django" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -87,7 +87,7 @@ resource "digitalocean_droplet" "app-counts" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -105,7 +105,7 @@ resource "digitalocean_droplet" "app-push" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -123,7 +123,7 @@ resource "digitalocean_droplet" "app-refresh" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -140,7 +140,7 @@ resource "digitalocean_droplet" "node-text" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -157,7 +157,7 @@ resource "digitalocean_droplet" "node-socket" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -174,7 +174,7 @@ resource "digitalocean_droplet" "node-favicons" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -191,7 +191,7 @@ resource "digitalocean_droplet" "node-images" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -208,7 +208,7 @@ resource "digitalocean_droplet" "node-page" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -225,7 +225,7 @@ resource "digitalocean_droplet" "db-elasticsearch" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -242,7 +242,7 @@ resource "digitalocean_droplet" "db-redis-user" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -259,7 +259,7 @@ resource "digitalocean_droplet" "db-redis-sessions" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -276,7 +276,7 @@ resource "digitalocean_droplet" "db-redis-story" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -293,7 +293,7 @@ resource "digitalocean_droplet" "db-redis-pubsub" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -310,7 +310,7 @@ resource "digitalocean_droplet" "db-postgres" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -328,7 +328,7 @@ resource "digitalocean_droplet" "db-mongo" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -346,7 +346,7 @@ resource "digitalocean_droplet" "task-celery" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -364,7 +364,7 @@ resource "digitalocean_droplet" "task-work" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -381,7 +381,7 @@ resource "digitalocean_droplet" "task-search" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"
@ -398,7 +398,7 @@ resource "digitalocean_droplet" "task-beat" {
size = var.droplet_size
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/generate.py; sleep 120"
command = "/srv/newsblur/ansible/utils/generate.py; sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/setup_root.yml"