Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
Infrastruktur
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Himmel
Infrastruktur
Commits
03feecbf
Commit
03feecbf
authored
4 years ago
by
MichiK
Browse files
Options
Downloads
Patches
Plain Diff
Adapt stuff to reality and allow embedding the angel guide
parent
aa391e56
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
host_vars/gabriel.c3heaven.de
+14
-5
14 additions, 5 deletions
host_vars/gabriel.c3heaven.de
roles/nginx-http/templates/default.j2
+6
-0
6 additions, 0 deletions
roles/nginx-http/templates/default.j2
roles/postfix/templates/aliases.j2
+24
-0
24 additions, 0 deletions
roles/postfix/templates/aliases.j2
with
44 additions
and
5 deletions
host_vars/gabriel.c3heaven.de
+
14
−
5
View file @
03feecbf
...
...
@@ -19,6 +19,10 @@ nginx_https_sites:
config
:
"
return
301
https://wiki.c3heaven.de$1?$args;"
-
location
:
"
~
/kanboard(.*)$"
config
:
"
return
301
https://kanboard.c3heaven.de$1?$args;"
-
location
:
"
~
/guide/(.*).pdf$"
config
:
|-
root /var/www/html;
add_header Access-Control-Allow-Origin *;
-
name
:
"
www.c3heaven.de"
locations
:
-
location
:
"
/"
...
...
@@ -88,7 +92,7 @@ nginx_https_sites:
proxy_pass http://127.0.0.1:3000;
proxy_cache_bypass $http_upgrade;
proxy_redirect off;
-
location
:
"
~
^/liste/?$"
-
location
:
"
~
^/liste
?
/?$"
config
:
|-
return 301 https://$host/Liste;
-
name
:
"
rt.c3heaven.de"
...
...
@@ -149,6 +153,15 @@ nginx_http_locations:
log_not_found off;
return 301 https://$host$request_uri;
nginx_additional_http_servers
:
-
config
:
|-
listen 127.0.0.1:9001;
location / {
include /etc/nginx/fastcgi_params;
fastcgi_param SCRIPT_NAME "";
fastcgi_pass 127.0.0.1:9000;
}
nginx_https_default_headers
:
-
'
Strict-Transport-Security
"max-age=31536000;
includeSubDomains"'
-
'
X-XSS-Protection
"1;
mode=block"'
...
...
@@ -163,10 +176,6 @@ postfix_myorigin: "c3heaven.de"
postfix_mynetworks
:
"
127.0.0.1/32
159.69.40.72/32
10.23.42.0/24
[::1]/128
[2a01:4f8:c2c:df32::]/64
[fe80::9400:ff:fe31:9902]/128
[fe80::8400:ff:fe34:27e5]/128"
postfix_generic_map
:
-
"
www-data@c3heaven.de
noreply@c3heaven.de"
postfix_additional_admin_aliases
:
-
shift
-
shifts
-
ticket
postfix_alias_maps
:
-
"
hash:/etc/aliases"
-
"
hash:/var/lib/mailman/data/aliases"
...
...
This diff is collapsed.
Click to expand it.
roles/nginx-http/templates/default.j2
+
6
−
0
View file @
03feecbf
...
...
@@ -16,3 +16,9 @@ server {
}
}
{% for server in nginx_additional_http_servers %}
server {
{{ server.config | indent(width=2, indentfirst=True) }}
}
{% endfor %}
This diff is collapsed.
Click to expand it.
roles/postfix/templates/aliases.j2
+
24
−
0
View file @
03feecbf
...
...
@@ -12,6 +12,30 @@ postmaster: admins
webmaster: admins
root: admins
# rt aliases for events
36c3: ticket
rc3: ticket
# generic rt aliases for standard tickets
shift: ticket
shifts: ticket
tickets: ticket
rt: ticket
ticket: "| /usr/bin/rt-mailgate --url http://localhost:9001 --queue 'Allgemein' --action correspond"
# buerokraten queue
buerokratie: buero
buerokraten: buero
buero: "| /usr/bin/rt-mailgate --url http://localhost:9001 --queue 'Buerokratie' --action correspond"
# additional rt queues
angel-guide: "| /usr/bin/rt-mailgate --url http://localhost:9001 --queue 'Angel Guide' --action correspond"
merch: "| /usr/bin/rt-mailgate --url http://localhost:9001 --queue 'Merch' --action correspond"
feedback: "| /usr/bin/rt-mailgate --url http://localhost:9001 --queue 'Feedback' --action correspond"
# noreply@ should be a blackhole for notification e-mails etc.
noreply: /dev/null
{% if postfix_additional_admin_aliases is defined and postfix_additional_admin_aliases%}
# additional admin aliases
{% for alias in postfix_additional_admin_aliases %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment