misc/ansible-base
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

[mod] rename roles according to new guidelines

Browse source
This commit is contained in:
Christian Fraß 2023-11-22 15:35:12 +01:00
parent 2747a5fe81
commit 1a7ea9558f
16 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ansible/roles/element-and-nginx/defaults/main.json Normal file
View file

@ -0,0 +1,4 @@
{
"var_element_and_nginx_domain": "element.example.org",
"var_element_and_nginx_path": "/opt/element"
}

6
ansible/roles/element-with-nginx/tasks/main.json → ansible/roles/element-and-nginx/tasks/main.json
View file

@ -12,7 +12,7 @@
"become": true,
"ansible.builtin.template": {
"src": "conf.j2",
"dest": "/etc/nginx/sites-available/{{var_element_with_nginx_domain}}"
"dest": "/etc/nginx/sites-available/{{var_element_and_nginx_domain}}"
}
},
{
@ -20,8 +20,8 @@
"become": true,
"ansible.builtin.file": {
"state": "link",
"src": "/etc/nginx/sites-available/{{var_element_with_nginx_domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_element_with_nginx_domain}}"
"src": "/etc/nginx/sites-available/{{var_element_and_nginx_domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_element_and_nginx_domain}}"
}
},
{

13
ansible/roles/element-and-nginx/templates/conf.j2 Normal file
View file

@ -0,0 +1,13 @@
server {
listen 80;
listen [::]:80;
listen 443 ssl;
listen [::]:443 ssl;
server_name {{var_element_and_nginx_domain}};
ssl_certificate /etc/ssl/certs/{{var_element_and_nginx_domain}}.pem;
ssl_certificate_key /etc/ssl/private/{{var_element_and_nginx_domain}}.pem;
root {{var_element_and_nginx_path}};
}

4
ansible/roles/element-with-nginx/defaults/main.json
View file

@ -1,4 +0,0 @@
{
"var_element_with_nginx_domain": "element.example.org",
"var_element_with_nginx_path": "/opt/element"
}

13
ansible/roles/element-with-nginx/templates/conf.j2
View file

@ -1,13 +0,0 @@
server {
listen 80;
listen [::]:80;
listen 443 ssl;
listen [::]:443 ssl;
server_name {{var_element_with_nginx_domain}};
ssl_certificate /etc/ssl/certs/{{var_element_with_nginx_domain}}.pem;
ssl_certificate_key /etc/ssl/private/{{var_element_with_nginx_domain}}.pem;
root {{var_element_with_nginx_path}};
}

3
ansible/roles/synapse-and-lighttpd/defaults/main.json Normal file
View file

@ -0,0 +1,3 @@
{
"var_synapse_and_lighttpd_domain": "REPLACE_ME"
}

0
ansible/roles/synapse-with-lighttpd/info.md → ansible/roles/synapse-and-lighttpd/info.md
View file

6
ansible/roles/synapse-with-lighttpd/tasks/main.json → ansible/roles/synapse-and-lighttpd/tasks/main.json
View file

@ -11,7 +11,7 @@
"become": true,
"ansible.builtin.template": {
"src": "conf.j2",
"dest": "/etc/lighttpd/conf-available/{{var_synapse_with_lighttpd_domain}}.conf"
"dest": "/etc/lighttpd/conf-available/{{var_synapse_and_lighttpd_domain}}.conf"
}
},
{
@ -19,8 +19,8 @@
"become": true,
"ansible.builtin.file": {
"state": "link",
"src": "/etc/lighttpd/conf-available/{{var_synapse_with_lighttpd_domain}}.conf",
"dest": "/etc/lighttpd/conf-enabled/{{var_synapse_with_lighttpd_domain}}.conf"
"src": "/etc/lighttpd/conf-available/{{var_synapse_and_lighttpd_domain}}.conf",
"dest": "/etc/lighttpd/conf-enabled/{{var_synapse_and_lighttpd_domain}}.conf"
}
},
{

29
ansible/roles/synapse-and-lighttpd/templates/conf.j2 Normal file
View file

@ -0,0 +1,29 @@
$HTTP["host"] == "{{var_synapse_and_lighttpd_domain}}" {
server.name = "{{var_synapse_and_lighttpd_domain}}"
## alle Anfragen auf Port 443
$SERVER["socket"] == ":443" {
## mit dem SSL-Kram beglücken
# ssl.engine = "enable"
# ssl.pemfile = "/etc/ssl/certs/{{var_synapse_and_lighttpd_domain}}.pem"
# ssl.privkey = "/etc/ssl/keys/{{var_synapse_and_lighttpd_domain}}.pem"
# ssl.ca-file = "/etc/ssl/fullchains/{{var_synapse_and_lighttpd_domain}}.pem"
# ssl.use-sslv2 = "disable"
# ssl.use-sslv3 = "disable"
}
## alle HTTP-Anfragen
$SERVER["socket"] == ":80" {
## auf HTTPS umleiten
# url.redirect = ("^/(.*)$" => "https://{{var_synapse_and_lighttpd_domain}}/$1")
}
proxy.server = (
"" => (
"" => (
"host" => "localhost",
"port" => 8008
)
)
)
}

3
ansible/roles/synapse-and-nginx/defaults/main.json Normal file
View file

@ -0,0 +1,3 @@
{
"var_synapse_and_nginx_domain": "REPLACE_ME"
}

0
ansible/roles/synapse-with-nginx/info.md → ansible/roles/synapse-and-nginx/info.md
View file

6
ansible/roles/synapse-with-nginx/tasks/main.json → ansible/roles/synapse-and-nginx/tasks/main.json
View file

@ -12,7 +12,7 @@
"become": true,
"ansible.builtin.template": {
"src": "conf.j2",
"dest": "/etc/nginx/sites-available/{{var_synapse_with_nginx_domain}}"
"dest": "/etc/nginx/sites-available/{{var_synapse_and_nginx_domain}}"
}
},
{
@ -20,8 +20,8 @@
"become": true,
"ansible.builtin.file": {
"state": "link",
"src": "/etc/nginx/sites-available/{{var_synapse_with_nginx_domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_synapse_with_nginx_domain}}"
"src": "/etc/nginx/sites-available/{{var_synapse_and_nginx_domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_synapse_and_nginx_domain}}"
}
},
{

6
ansible/roles/synapse-with-nginx/templates/conf.j2 → ansible/roles/synapse-and-nginx/templates/conf.j2
View file

@ -8,10 +8,10 @@ server {
listen 8448 ssl http2 default_server;
listen [::]:8448 ssl http2 default_server;
server_name {{var_synapse_with_nginx_domain}};
server_name {{var_synapse_and_nginx_domain}};
ssl_certificate /etc/ssl/certs/{{var_synapse_with_nginx_domain}}.pem;
ssl_certificate_key /etc/ssl/private/{{var_synapse_with_nginx_domain}}.pem;
ssl_certificate /etc/ssl/certs/{{var_synapse_and_nginx_domain}}.pem;
ssl_certificate_key /etc/ssl/private/{{var_synapse_and_nginx_domain}}.pem;
location ~ ^(/_matrix|/_synapse/client) {
proxy_pass http://localhost:8008;

3
ansible/roles/synapse-with-lighttpd/defaults/main.json
View file

@ -1,3 +0,0 @@
{
"var_synapse_with_lighttpd_domain": "REPLACE_ME"
}

29
ansible/roles/synapse-with-lighttpd/templates/conf.j2
View file

@ -1,29 +0,0 @@
$HTTP["host"] == "{{var_synapse_with_lighttpd_domain}}" {
server.name = "{{var_synapse_with_lighttpd_domain}}"
## alle Anfragen auf Port 443
$SERVER["socket"] == ":443" {
## mit dem SSL-Kram beglücken
# ssl.engine = "enable"
# ssl.pemfile = "/etc/ssl/certs/{{var_synapse_with_lighttpd_domain}}.pem"
# ssl.privkey = "/etc/ssl/keys/{{var_synapse_with_lighttpd_domain}}.pem"
# ssl.ca-file = "/etc/ssl/fullchains/{{var_synapse_with_lighttpd_domain}}.pem"
# ssl.use-sslv2 = "disable"
# ssl.use-sslv3 = "disable"
}
## alle HTTP-Anfragen
$SERVER["socket"] == ":80" {
## auf HTTPS umleiten
# url.redirect = ("^/(.*)$" => "https://{{var_synapse_with_lighttpd_domain}}/$1")
}
proxy.server = (
"" => (
"" => (
"host" => "localhost",
"port" => 8008
)
)
)
}

3
ansible/roles/synapse-with-nginx/defaults/main.json
View file

@ -1,3 +0,0 @@
{
"var_synapse_with_nginx_domain": "REPLACE_ME"
}