diff --git a/.gitignore b/.gitignore index fe883c4..097e4bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store *.local ansible/secret secret diff --git a/ansible/inventory/group_vars/all/bootstrap.yml b/ansible/inventory/group_vars/all/bootstrap.yml index a518375..65f1db9 100644 --- a/ansible/inventory/group_vars/all/bootstrap.yml +++ b/ansible/inventory/group_vars/all/bootstrap.yml @@ -1,5 +1,5 @@ --- -netbase__domain: 'erethon.com' +netbase__domain: 'dtsironis.net' bootstrap__admin_default_users: [] bootstrap__admin_sshkeys: [] diff --git a/ansible/inventory/group_vars/all/monit.yml b/ansible/inventory/group_vars/all/monit.yml index d686c31..4769aff 100644 --- a/ansible/inventory/group_vars/all/monit.yml +++ b/ansible/inventory/group_vars/all/monit.yml @@ -1,7 +1,3 @@ --- -monit_mail_servers: - - host: 'mail.erethon.com' - port: 587 - monit_fs_percentage: 75 diff --git a/ansible/inventory/group_vars/all/users.yml b/ansible/inventory/group_vars/all/users.yml index f2f390f..0241e17 100644 --- a/ansible/inventory/group_vars/all/users.yml +++ b/ansible/inventory/group_vars/all/users.yml @@ -3,21 +3,20 @@ users__enabled: True users__dotfiles_enabled: True -users__dotfiles_name: 'erethon' +users__dotfiles_name: 'tsironis' users__dotfiles_default_map: - 'erethon': - repo: 'https://github.com/erethon/dotfiles.git' + 'tsironis': + repo: 'https://github.com/tsironis/dotfiles.git' users__accounts: - - name: 'dgrig' + - name: 'tsironis' state: present - group: 'dgrig' + group: 'tsironis' groups: ['admins'] append: True gid: 1005 uid: 1005 shell: '/usr/bin/zsh' openbsdshell: '/usr/local/bin/zsh' - sshkeys: [ 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDb/e7O6zcnEhaGz2JyzWCP7rWCCO0ZWwZvHeSYtQ6D384ZssDFupvoEIhVvPnuYbl3/jzXN69D/gm2w95hv82swUOvSbOhxhqga5HEZh5doC2RjAIchOaAqSOKPKQfaSZroZ+l+eUtcm8I4L6+xdUtSMaNndHQwWa2mllhZ21jrF6msublVuvy/ATjwHLdLd1MAORoYXKja84cejj0cQdVbyv36vqQmBeuU87//4mw45/IIpef3t6UjGjTAyUVGih2LQdX0Y4rghFwt1pc1x4oQxp4hThCQFYikTUtAw1CLFRjfnaU1KyCTc9akV6rf0NowChsENj1TvczTQg9tjlHA28rhpP6W2gN9buHzU/tG13pkBC/0PLmUtN7U95nAPNEYbjxQAbGKU9/lWICU0EEYoHFb+qhRiCdM0fek/9jj0F84ur4yWDQ9xtJKAg/mtNF3VyFbV86pmXnlTVdCzeW8eIU6BHOtc29i5BIXPUp9A2jELSY3FraTF2a7c2WCO6L43sJRwKl6U78QGpSHXSUN+fJIgK1MrvjEtoKRKHMeVdTtkqhabQqySaDl92PH6cVFHrLMhCB0YG5HFdsWoS+KxrRpCA4y9709+tNq5ulqgw/eD7RPbDP1SmHOEHSowF3A8DhfL3Sw1xoHQsr+/ghUFWvoylr+knDf+/PM0UCbw==' ] - forward: [ 'abuse@erethon.com' ] \ No newline at end of file + sshkeys: [ 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIuwVLDASGrbHpw49LWj4hIwG2SCiaYaUVxqyzIk5LU0pmzfLSPfbwhs88IKqtz3V2TopqdlveLhLSeSlwIsyd+XddsvFmcwOojxzdD508DahVnrb/twCQQ2eU/Y9achNqUjjz2aqG/xfxPzCUn5NeZSb84gXxe3jRqN0dZc+TS5i6hsGGYwrZER9tjeXYuRD9867+rvUDJ8XybwQ9UG6yDc6fDyri5AoJcWYZ/YYXPM1qswTgpcwY6vktSDShgb4ORvOROEOoa9N+h1G9zu4bEz/egq+brZ/beRbtHTxsMD4bHD3vdad6eXRDLZU74xFq84WydcBuonYIfqWZGQFuoszjtWxxaShi4qswLExEMnNZmIGNJgI4myTitihj4avllleDM0kVkpcrWI0/lsUy/a8HLpURijzzfRhusxRevTijtb9dMvPNPb+YsKs/G44OvLxKAuf8ZyfL+Zdnu/oJkJCblSjPYKV77KV8vUE8Z6BMcMxhMPrs4e5N+qJbPxwxLq8/quFFLZnpXlTaDDa3JONJ7r60TGhXIIAjEYcx3uw3lYIk0T01wdRQKhuKt0yNHT2u2cYkb21eEKpCvC6U6a6fvU7JrMO0iYRC5RE+KCgiggcoYPvak62BFiHLUB5yw6wEPQ9wb1p+shnPkBDPsOilDafEB8/XifSL7r83Mw== tsironis.dimitris@gmail.com' ] diff --git a/ansible/inventory/group_vars/etherpad/all.yml b/ansible/inventory/group_vars/etherpad/all.yml deleted file mode 100644 index a37fc56..0000000 --- a/ansible/inventory/group_vars/etherpad/all.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -etherpad__mysql_root_password: '{{ lookup("password", secret + "/credentials/etherpad.erethon.com/mysql/password") }}' diff --git a/ansible/inventory/group_vars/f.erethon.com/all.yml b/ansible/inventory/group_vars/f.erethon.com/all.yml deleted file mode 100644 index 163124b..0000000 --- a/ansible/inventory/group_vars/f.erethon.com/all.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -files__private_ip: '192.168.122.4' -files__port: '28081' diff --git a/ansible/inventory/group_vars/openbsd/all.yml b/ansible/inventory/group_vars/openbsd/all.yml deleted file mode 100644 index c308db6..0000000 --- a/ansible/inventory/group_vars/openbsd/all.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -openbsd__packages: ['zsh', 'git'] diff --git a/ansible/inventory/group_vars/plothopes/all.yml b/ansible/inventory/group_vars/plothopes/all.yml deleted file mode 100644 index f879a5c..0000000 --- a/ansible/inventory/group_vars/plothopes/all.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -plothopes__mysql_root_password: '{{ lookup("password", secret + "/credentials/plothopes.com/mysql/password") }}' -plothopes__private_ip: '192.168.122.4' -plothopes__port: '28080' diff --git a/ansible/inventory/group_vars/xmpp/ferm.yml b/ansible/inventory/group_vars/xmpp/ferm.yml deleted file mode 100644 index 870b300..0000000 --- a/ansible/inventory/group_vars/xmpp/ferm.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -ferm__group_rules: - - type: 'accept' - filename: 'prosody' - name: 'prosody' - table: 'filter' - chain: 'INPUT' - dport: [ 5269 ] - protocol: 'tcp' - domain: 'ip' diff --git a/ansible/inventory/host_vars/spinny/apt_install.yml b/ansible/inventory/host_vars/anduril/apt_install.yml similarity index 100% rename from ansible/inventory/host_vars/spinny/apt_install.yml rename to ansible/inventory/host_vars/anduril/apt_install.yml diff --git a/ansible/inventory/host_vars/spinny/cron.yml b/ansible/inventory/host_vars/anduril/cron.yml similarity index 100% rename from ansible/inventory/host_vars/spinny/cron.yml rename to ansible/inventory/host_vars/anduril/cron.yml diff --git a/ansible/inventory/host_vars/spinny/ferm.yml b/ansible/inventory/host_vars/anduril/ferm.yml similarity index 100% rename from ansible/inventory/host_vars/spinny/ferm.yml rename to ansible/inventory/host_vars/anduril/ferm.yml diff --git a/ansible/inventory/host_vars/anduril/haproxy.yml b/ansible/inventory/host_vars/anduril/haproxy.yml new file mode 100644 index 0000000..addf198 --- /dev/null +++ b/ansible/inventory/host_vars/anduril/haproxy.yml @@ -0,0 +1,2 @@ +--- +certs__names: ['grafana.dtsironis.net', 'capitalism.dtsironis.net', 'dtsironis.net',] diff --git a/ansible/inventory/host_vars/spinny/monitoring.yml b/ansible/inventory/host_vars/anduril/monitoring.yml similarity index 100% rename from ansible/inventory/host_vars/spinny/monitoring.yml rename to ansible/inventory/host_vars/anduril/monitoring.yml diff --git a/ansible/inventory/host_vars/archiver/users.yml b/ansible/inventory/host_vars/archiver/users.yml deleted file mode 100644 index d84987e..0000000 --- a/ansible/inventory/host_vars/archiver/users.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -users__host_accounts: - - name: 'archiver' - group: 'archiver' - groups: [ 'sshusers' ] - shell: '/usr/bin/zsh' - sshkeys: [ 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDb/e7O6zcnEhaGz2JyzWCP7rWCCO0ZWwZvHeSYtQ6D384ZssDFupvoEIhVvPnuYbl3/jzXN69D/gm2w95hv82swUOvSbOhxhqga5HEZh5doC2RjAIchOaAqSOKPKQfaSZroZ+l+eUtcm8I4L6+xdUtSMaNndHQwWa2mllhZ21jrF6msublVuvy/ATjwHLdLd1MAORoYXKja84cejj0cQdVbyv36vqQmBeuU87//4mw45/IIpef3t6UjGjTAyUVGih2LQdX0Y4rghFwt1pc1x4oQxp4hThCQFYikTUtAw1CLFRjfnaU1KyCTc9akV6rf0NowChsENj1TvczTQg9tjlHA28rhpP6W2gN9buHzU/tG13pkBC/0PLmUtN7U95nAPNEYbjxQAbGKU9/lWICU0EEYoHFb+qhRiCdM0fek/9jj0F84ur4yWDQ9xtJKAg/mtNF3VyFbV86pmXnlTVdCzeW8eIU6BHOtc29i5BIXPUp9A2jELSY3FraTF2a7c2WCO6L43sJRwKl6U78QGpSHXSUN+fJIgK1MrvjEtoKRKHMeVdTtkqhabQqySaDl92PH6cVFHrLMhCB0YG5HFdsWoS+KxrRpCA4y9709+tNq5ulqgw/eD7RPbDP1SmHOEHSowF3A8DhfL3Sw1xoHQsr+/ghUFWvoylr+knDf+/PM0UCbw==' ] - forward: [ 'abuse@erethon.com' ] \ No newline at end of file diff --git a/ansible/inventory/host_vars/spinny/haproxy.yml b/ansible/inventory/host_vars/spinny/haproxy.yml deleted file mode 100644 index 731d9fa..0000000 --- a/ansible/inventory/host_vars/spinny/haproxy.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -prosody__public_ip: '163.172.24.171' -prosody__private_ip: '192.168.122.2' -static__private_ip: '192.168.122.2' -buildbot__private_ip: '192.168.122.57' - -certs__names: ['f.erethon.com', 'chat.erethon.com', 'grafana.erethon.com', - 'capitalism.erethon.com', 'blog.erethon.com', 'erethon.com', - 'www.plothopes.com', 'about.erethon.com', 'git.erethon.com', - 'buildbot.erethon.com'] - -buildbot__username: '{{ lookup("password", secret + "/credentials/spinny.erethon.com/haproxy/username") }}' -buildbot__password: '{{ lookup("password", secret + "/credentials/spinny.erethon.com/haproxy/password") }}' diff --git a/ansible/playbooks/base_openbsd.yml b/ansible/playbooks/base_openbsd.yml deleted file mode 100644 index 57487bc..0000000 --- a/ansible/playbooks/base_openbsd.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: OpenBSD main config - hosts: [ 'openbsd', '!openbsd_exclude' ] - gather_facts: True - become: True - - roles: - - openbsd diff --git a/ansible/playbooks/etherpad.erethon.yml b/ansible/playbooks/etherpad.erethon.yml deleted file mode 100644 index 1e1388d..0000000 --- a/ansible/playbooks/etherpad.erethon.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -- hosts: spinny - become: True - - roles: - - role: debops.secret - - role: etherpad.erethon.com diff --git a/ansible/playbooks/plothopes.com b/ansible/playbooks/plothopes.com deleted file mode 100644 index d286f1a..0000000 --- a/ansible/playbooks/plothopes.com +++ /dev/null @@ -1,28 +0,0 @@ ---- - -- hosts: docker - become: True - - environment: '{{ inventory__environment | d({}) - | combine(inventory__group_environment | d({})) - | combine(inventory__host_environment | d({})) }}' - - roles: - - - role: debops.secret - - - role: debops.etc_services - tags: [ 'role::etc_services' ] - etc_services__dependent_list: - - '{{ docker__etc_services__dependent_list }}' - - - role: debops.ferm - tags: [ 'role::ferm' ] - ferm__dependent_rules: - - '{{ docker__ferm__dependent_rules }}' - - - role: debops.docker - tags: [ 'role::docker' ] - - - role: docker - - role: plothopes.com diff --git a/ansible/playbooks/prosody.yml b/ansible/playbooks/prosody.yml deleted file mode 100644 index 1c5e56b..0000000 --- a/ansible/playbooks/prosody.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- hosts: xmpp - become: True - - roles: - - - role: debops.ferm - tags: [ 'role::ferm' ] - - role: chat.erethon.com diff --git a/ansible/playbooks/webd.yml b/ansible/playbooks/webd.yml index e05abdc..2038ec0 100644 --- a/ansible/playbooks/webd.yml +++ b/ansible/playbooks/webd.yml @@ -4,4 +4,4 @@ roles: - - role: static.erethon.com + - role: static.dtsironis.net diff --git a/ansible/roles/chat.erethon.com/tasks/main.yml b/ansible/roles/chat.erethon.com/tasks/main.yml deleted file mode 100644 index 2defc73..0000000 --- a/ansible/roles/chat.erethon.com/tasks/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -- name: chat.erethon.com xmpp docker - docker: - name: chat.erethon.com - image: prosody/prosody - state: restarted - restart_policy: always - pull: always - ports: - - 5222:5222 - - 5269:5269 - volumes: - - /data/volumes/prosody/etc:/etc/prosody:ro - - /data/volumes/prosody/data:/var/lib/prosody diff --git a/ansible/roles/etherpad.erethon.com/tasks/main.yml b/ansible/roles/etherpad.erethon.com/tasks/main.yml deleted file mode 100644 index 2c0ad54..0000000 --- a/ansible/roles/etherpad.erethon.com/tasks/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- - -- name: etherpad.erethon.com mysql docker - docker_container: - name: etherpad-db - image: mysql/mysql-server - state: started - restart_policy: always - pull: true - volumes: - - /data/volumes/etherpad:/var/lib/mysql - env: - MYSQL_ROOT_PASSWORD="{{ etherpad__mysql_root_password }}" - -- name: etherpad.erethon.com node docker - docker_container: - name: etherpad-node - image: tvelocity/etherpad-lite - state: started - restart_policy: always - pull: true - ports: - - 127.0.0.1:18084:9001 - env: - ETHERPAD_DB_PASSWORD="{{ etherpad__mysql_root_password }}" - ETHERPAD_DB_HOST="mysql" - ETHERPAD_DB_NAME="pad" - links: etherpad-db:mysql diff --git a/ansible/roles/f.erethon.com/tasks/main.yml b/ansible/roles/f.erethon.com/tasks/main.yml deleted file mode 100644 index 6d28197..0000000 --- a/ansible/roles/f.erethon.com/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- - -- name: f.erethon.com nginx docker - docker_container: - name: f.erethon.com - image: nginx - state: started - restart_policy: always - pull: true - ports: - - "{{ files__private_ip }}:{{ files__port }}:80" - volumes: - - "{{ docker__volumes_location }}/f.erethon.com:/usr/share/nginx/html:ro" diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 674f1c7..944a4b8 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -28,18 +28,6 @@ defaults errorfile 503 /etc/haproxy/errors/503.http errorfile 504 /etc/haproxy/errors/504.http -userlist buildbotusers - user {{ buildbot__username }} password {{ buildbot__password }} - -frontend prosody_muc - bind {{ prosody__public_ip }}:5269 - mode tcp - default_backend prosody_muc - -backend prosody_muc - mode tcp - server prosody_muc {{ prosody__private_ip }}:5269 - frontend eighty bind *:80 mode http @@ -52,34 +40,18 @@ frontend ssl http-request set-header X-Forwarded-Proto https if { ssl_fc } use_backend local if { url_beg /.well-known } - use_backend plothopes if { hdr(host) -i plothopes.com -i www.plothopes.com } - use_backend f.erethon.com if { hdr(host) -i f.erethon.com } - use_backend grafana.erethon.com if { hdr(host) -i grafana.erethon.com } - use_backend static if { hdr(host) -i capitalism.erethon.com -i hacked.erethon.com -i erethon.com -i www.erethon.com -i blog.erethon.com -i about.erethon.com -i git.erethon.com } - use_backend buildbot if { hdr(host) -i buildbot.erethon.com } - -backend plothopes - mode http - server plothopes {{ plothopes__private_ip }}:{{ plothopes__port }} + use_backend grafana.dtsironis.net if { hdr(host) -i grafana.dtsironis.net } + use_backend static if { hdr(host) -i capitalism.dtsironis.net -i hacked.dtsironis.net -i dtsironis.net -i www.dtsironis.net } + use_backend buildbot if { hdr(host) -i buildbot.dtsironis.net } -backend f.erethon.com +backend grafana.dtsironis.net mode http - server f.erethon.com {{ files__private_ip }}:{{ files__port }} - -backend grafana.erethon.com - mode http - server grafana.erethon.com {{ grafana__private_ip }}:{{ grafana__port }} + server grafana.dtsironis.net {{ grafana__private_ip }}:{{ grafana__port }} backend static mode http server webd {{ static__private_ip }}:80 -backend buildbot - mode http - acl authbuildbotusers http_auth(buildbotusers) - http-request auth realm buildbotrealm if !authbuildbotusers - server obsd001 {{ buildbot__private_ip }}:8010 - backend local mode http server local 127.0.0.1:8080 diff --git a/ansible/roles/laptop/files/etc/pf.conf b/ansible/roles/laptop/files/etc/pf.conf deleted file mode 100644 index 8e2d0d7..0000000 --- a/ansible/roles/laptop/files/etc/pf.conf +++ /dev/null @@ -1,7 +0,0 @@ -block log all - -tcp_services = "{ ftp, ssh, smtp, http, https, 222, 993, 655, 587 }" -udp_services = "{ domain, 655, 25826 }" - -pass out proto tcp to port $tcp_services -pass out proto udp to port $udp_services diff --git a/ansible/roles/laptop/files/etc/rc.conf.local.gitignore b/ansible/roles/laptop/files/etc/rc.conf.local.gitignore deleted file mode 100644 index f736c28..0000000 --- a/ansible/roles/laptop/files/etc/rc.conf.local.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -apmd_flags="-A" -slaacd_flags=NO -smtpd_flags=NO -sshd_flags=NO -xenodm_flags= -sensorsd_flags="-c 60" -unbound_flags="-c /etc/unbound.conf" diff --git a/ansible/roles/openbsd/files/installurl b/ansible/roles/openbsd/files/installurl deleted file mode 100644 index 744302b..0000000 --- a/ansible/roles/openbsd/files/installurl +++ /dev/null @@ -1 +0,0 @@ -https://ftp.fr.openbsd.org/pub/OpenBSD diff --git a/ansible/roles/openbsd/tasks/main.yml b/ansible/roles/openbsd/tasks/main.yml deleted file mode 100644 index be5ce92..0000000 --- a/ansible/roles/openbsd/tasks/main.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- - -- name: Copy installurl - copy: - src: installurl - dest: /etc/installurl - -- name: Install packages - openbsd_pkg: - name: "{{ item }}" - state: present - with_items: - - "{{ openbsd__packages }}" - -- name: Create groups - group: - name: "{{ item.group | d(item.name) }}" - with_flattened: - - "{{ users__accounts }}" - -- name: Create management user - user: - name: "{{ item.name }}" - group: "{{ item.group }}" - state: "{{ item.state }}" - append: "{{ item.append }}" - shell: "{{ item.openbsdshell }}" - with_items: - - "{{ users__accounts }}" - -- authorized_key: - user: "{{ item.name }}" - state: present - key: "{{ item.sshkeys[0] }}" - with_items: - - "{{ users__accounts }}" diff --git a/ansible/roles/plothopes.com/tasks/main.yml b/ansible/roles/plothopes.com/tasks/main.yml deleted file mode 100644 index ff86456..0000000 --- a/ansible/roles/plothopes.com/tasks/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- - -- name: plothopes.com mysql docker - docker_container: - name: plothopes-db - image: mysql:5 - state: started - restart_policy: always - pull: true - volumes: - - "{{ docker__volumes_location }}/plothopes-db:/var/lib/mysql" - env: - MYSQL_ROOT_PASSWORD: "{{ plothopes__mysql_root_password }}" - -- name: plothopes.com wordpress docker - docker_container: - name: plothopes-wordpress - image: wordpress - state: started - restart_policy: always - pull: true - ports: - - "{{ plothopes__private_ip }}:{{ plothopes__port }}:80" - volumes: - - "{{ docker__volumes_location }}/plothopes-wp/sparkling:/var/www/html/wp-content/themes/sparkling/" - - "{{ docker__volumes_location }}/plothopes-wp/uploads:/var/www/html/wp-content/uploads/" - - "{{ docker__volumes_location }}/plothopes-wp/plugins:/var/www/html/wp-content/plugins/" - links: plothopes-db:mysql diff --git a/ansible/roles/static.erethon.com/files/httpd.conf b/ansible/roles/static.dtsironis.net/files/httpd.conf similarity index 100% rename from ansible/roles/static.erethon.com/files/httpd.conf rename to ansible/roles/static.dtsironis.net/files/httpd.conf diff --git a/ansible/roles/static.dtsironis.net/files/httpd/capitalism.conf b/ansible/roles/static.dtsironis.net/files/httpd/capitalism.conf new file mode 100644 index 0000000..0443d8c --- /dev/null +++ b/ansible/roles/static.dtsironis.net/files/httpd/capitalism.conf @@ -0,0 +1,4 @@ +server "capitalism.dtsironis.net" { + listen on * port 80 + root "/htdocs/capitalism.dtsironis.net" +} diff --git a/ansible/roles/static.dtsironis.net/files/httpd/dtsironis.conf b/ansible/roles/static.dtsironis.net/files/httpd/dtsironis.conf new file mode 100644 index 0000000..ca150aa --- /dev/null +++ b/ansible/roles/static.dtsironis.net/files/httpd/dtsironis.conf @@ -0,0 +1,5 @@ +server "dtsironis.net" { + alias "www.dtsironis.net" + listen on * port 80 + root "/htdocs/dtsironis.net" +} diff --git a/ansible/roles/static.dtsironis.net/files/httpd/hacked.conf b/ansible/roles/static.dtsironis.net/files/httpd/hacked.conf new file mode 100644 index 0000000..e4e7882 --- /dev/null +++ b/ansible/roles/static.dtsironis.net/files/httpd/hacked.conf @@ -0,0 +1,4 @@ +server "hacked.dtsironis.net" { + listen on * port 80 + root "/htdocs/hacked.dtsironis.net" +} diff --git a/ansible/roles/static.erethon.com/handlers/main.yml b/ansible/roles/static.dtsironis.net/handlers/main.yml similarity index 100% rename from ansible/roles/static.erethon.com/handlers/main.yml rename to ansible/roles/static.dtsironis.net/handlers/main.yml diff --git a/ansible/roles/static.erethon.com/tasks/main.yml b/ansible/roles/static.dtsironis.net/tasks/main.yml similarity index 87% rename from ansible/roles/static.erethon.com/tasks/main.yml rename to ansible/roles/static.dtsironis.net/tasks/main.yml index 75638a2..71291c5 100644 --- a/ansible/roles/static.erethon.com/tasks/main.yml +++ b/ansible/roles/static.dtsironis.net/tasks/main.yml @@ -23,8 +23,5 @@ with_items: - capitalism - hacked - - erethon - - blog - - about.erethon.com - - git.erethon.com + - dtsironis notify: Restart httpd diff --git a/ansible/roles/static.erethon.com/files/httpd/about.erethon.com.conf b/ansible/roles/static.erethon.com/files/httpd/about.erethon.com.conf deleted file mode 100644 index 5427d8c..0000000 --- a/ansible/roles/static.erethon.com/files/httpd/about.erethon.com.conf +++ /dev/null @@ -1,4 +0,0 @@ -server "about.erethon.com" { - listen on * port 80 - root "/htdocs/about.erethon.com" -} diff --git a/ansible/roles/static.erethon.com/files/httpd/blog.conf b/ansible/roles/static.erethon.com/files/httpd/blog.conf deleted file mode 100644 index 1425316..0000000 --- a/ansible/roles/static.erethon.com/files/httpd/blog.conf +++ /dev/null @@ -1,4 +0,0 @@ -server "blog.erethon.com" { - listen on * port 80 - root "/htdocs/blog.erethon.com" -} diff --git a/ansible/roles/static.erethon.com/files/httpd/capitalism.conf b/ansible/roles/static.erethon.com/files/httpd/capitalism.conf deleted file mode 100644 index c746de6..0000000 --- a/ansible/roles/static.erethon.com/files/httpd/capitalism.conf +++ /dev/null @@ -1,4 +0,0 @@ -server "capitalism.erethon.com" { - listen on * port 80 - root "/htdocs/capitalism.erethon.com" -} diff --git a/ansible/roles/static.erethon.com/files/httpd/erethon.conf b/ansible/roles/static.erethon.com/files/httpd/erethon.conf deleted file mode 100644 index dcf82fd..0000000 --- a/ansible/roles/static.erethon.com/files/httpd/erethon.conf +++ /dev/null @@ -1,5 +0,0 @@ -server "erethon.com" { - alias "www.erethon.com" - listen on * port 80 - root "/htdocs/erethon.com" -} diff --git a/ansible/roles/static.erethon.com/files/httpd/git.erethon.com.conf b/ansible/roles/static.erethon.com/files/httpd/git.erethon.com.conf deleted file mode 100644 index 4fbb4b2..0000000 --- a/ansible/roles/static.erethon.com/files/httpd/git.erethon.com.conf +++ /dev/null @@ -1,4 +0,0 @@ -server "git.erethon.com" { - listen on * port 80 - root "/htdocs/git.erethon.com/" -} diff --git a/ansible/roles/static.erethon.com/files/httpd/hacked.conf b/ansible/roles/static.erethon.com/files/httpd/hacked.conf deleted file mode 100644 index 92974d1..0000000 --- a/ansible/roles/static.erethon.com/files/httpd/hacked.conf +++ /dev/null @@ -1,4 +0,0 @@ -server "hacked.erethon.com" { - listen on * port 80 - root "/htdocs/hacked.erethon.com" -}