Add hitch & varnish, inspircd and murmur

This commit is contained in:
Alex 2020-05-24 14:49:39 +02:00
parent 9c9606453f
commit a910ae5ea8
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
11 changed files with 80 additions and 15 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
todo.txt

9
.gitmodules vendored
View File

@ -52,3 +52,12 @@
[submodule "roles/pleroma"]
path = roles/pleroma
url = https://git.redxen.eu/RedXen/ansible-pleroma
[submodule "roles/hitch"]
path = roles/hitch
url = https://git.redxen.eu/RedXen/ansible-hitch/
[submodule "roles/inspircd"]
path = roles/inspircd
url = https://git.redxen.eu/RedXen/ansible-inspircd/
[submodule "roles/varnish"]
path = roles/varnish
url = https://git.redxen.eu/RedXen/ansible-varnish/

View File

@ -3,11 +3,17 @@
vars:
apt_packages:
- { package: "haproxy", state: present }
- { package: "hitch", state: present }
- { package: "varnish", state: present }
systemd:
services:
- { name: "haproxy", enabled: true, action: reloaded, daemon_reload: true}
- { name: "hitch", enabled: true, action: reloaded, daemon_reload: true}
- { name: "varnish", enabled: true, action: reloaded, daemon_reload: true}
overrides:
- "haproxy"
- "hitch"
- "varnish"
haproxy:
socketroot: "/run/haproxy"
config: "/etc/haproxy/haproxy.cfg"
@ -25,7 +31,26 @@
- {domain: "dev-gitea", service: "gitea", httpchk: true}
- {domain: "dev-transmission", service: "transmission", httpchk: false}
- {domain: "dev-sd", service: "seedown", httpchk: true}
varnish:
backend:
sock: '{{ haproxy.socketroot }}/haproxy.sock'
frontend:
sock: '/var/run/varnish.sock'
user: '_hitch'
group: '_hitch'
mode: '660'
jail:
user: 'varnish'
hitch:
backend:
sock: '{{ varnish.frontend.sock }}'
user: '_hitch'
group: '_hitch'
frontend:
port: 443
roles:
- apt
- haproxy
- varnish
- hitch
- systemd

1
roles/hitch Submodule

@ -0,0 +1 @@
Subproject commit df760d20353762064005594cea6955af8a7135f2

1
roles/inspircd Submodule

@ -0,0 +1 @@
Subproject commit a8694d4ad841480a928f213d61f59b5e2648e605

@ -1 +1 @@
Subproject commit 385fda1e1b093c0478865238b6778d5cee85a8e1
Subproject commit 654b9730f223f3137b97aa4c08acfc8ffe829540

@ -1 +1 @@
Subproject commit 4c83c16780f1c822d49c78b6d2ce180cd4120492
Subproject commit 8c18f3ee119e2bb7be21b172c2a703301aab21b1

@ -1 +1 @@
Subproject commit 105f71efcdbab67788c8a847da7a4373d675c9ef
Subproject commit 92e702c2ee225fead8dfb384284563f084349b3d

1
roles/varnish Submodule

@ -0,0 +1 @@
Subproject commit 3e9080e2198e1081daf0e068b92f739233793c3a

@ -1 +1 @@
Subproject commit 6f146f527c224557ec2fffc2af651372cb5b2b56
Subproject commit 4e23fa027d86f4e70ade2147cbc771dd1ffb7ffb

View File

@ -1,11 +1,18 @@
---
- hosts: social
vars:
#git_clone:
git_clone:
# - { dest: "/home/repositories/pleroma", repo: "https://git.pleroma.social/pleroma/pleroma.git", branch: "develop" }
- { dest: "{{ inspircd.paths.build }}", repo: "https://github.com/inspircd/inspircd.git", branch: "insp3" }
file:
- { path: '/etc/murmur', owner: 'root', group: 'root', mode: '600', state: directory }
- { path: '{{ inspircd.paths.build }}/.configure', owner: 'root', group: 'root', mode: '600', state: directory }
- { path: '{{ inspircd.paths.config }}/conf', owner: 'nobody', group: 'nogroup', mode: '600', state: directory }
apt_packages:
- { package: "git", state: present }
#- { package: "gcc", state: present }
- { package: "gcc", state: present }
- { package: "build-essential", state: present }
#- { package: "musl-dev", state: present }
# Pleroma (Elixir)
#- { package: "libncurses6", state: present }
@ -14,27 +21,30 @@
# Mumble
- { package: "libqt5sql5-psql", state: present }
- { package: "mumble-server", state: present }
- { package: "xz-utils", state: present }
- { package: "libmariadbclient-dev", state: present }
# InspIRCd
- { package: "libpq-dev", state: present }
systemd:
services:
#- { name: "pleroma", enabled: true, action: restarted }
- { name: "murmur", enabled: true, action: restarted }
overrides:
- "murmur"
- { name: "inspircd", enabled: true, action: restarted }
murmur:
configpath: "{{ global.murmur.configpath }}"
configpath: "{{ global.social.murmur.configpath }}"
name: "RedXen Community Mumble [High Bandwidth, User channels, 24/7]"
username: "root"
defaultchan: 1
listen:
host: "{{ ansible_ens10.ipv4.address }} ::1"
port: "{{ global.murmur.port }}"
port: "{{ global.social.murmur.port }}"
database:
host: "{{ global.postgres.host }}"
port: "{{ global.postgres.port }}"
host: "{{ global.backend.postgres.host }}"
port: "{{ global.backend.postgres.port }}"
driver: "QPSQL"
dbname: "murmur"
username: "murmur"
password: "{{ vault_postgres.dbpass[murmur.database.username]|default() }}"
password: "{{ vault_postgres.dbpass['murmur']|default() }}"
register:
host: "redxen.eu"
url: "redxen.eu"
@ -46,10 +56,27 @@
Enjoy your stay!<br />
Have a group that you want to represent or a question? Contact me at caskd@gmx.de<br />
</center>
inspircd:
server:
name: "redxen.eu"
description: "RedXen IRC Community"
network: "RedXen"
bind:
- { address: "", port: 6667, tls: false, type: "clients" }
- { address: "", port: 6697, tls: true, type: "clients" }
#- { address: "", port: 7000, tls: false, type: "servers" }
#- { address: "", port: 70001, tls: true, type: "servers" }
paths:
config: '/etc/inspircd'
build: '/home/repositories/inspircd'
permchannels:
- { channel: "redxen", topic: "Welcome to RedXen IRC | https://redxen.eu", modes: "+nt *!*@*!*" }
- { channel: "support", topic: "Have patience when asking, it can take some time until someone answers your question", modes: "+nt *!*@*!*" }
roles:
#- git-clone # NOTE: Uncomment when parse_trans supports OTP >= 21
- git-clone # NOTE: Uncomment pleroma stuff when parse_trans supports OTP >= 21
- apt
- file
#- pleroma
- murmur
- file
- inspircd
- systemd