diff --git a/mautrix-signal/docker-compose.yml b/mautrix-signal/docker-compose.yml index c2534c8..5d9ef1d 100644 --- a/mautrix-signal/docker-compose.yml +++ b/mautrix-signal/docker-compose.yml @@ -8,7 +8,7 @@ services: - /var/signald:/signald networks: - matrix_net - - postgrs_net + - postgres_net signald: image: docker.io/finn/signald:latest restart: unless-stopped diff --git a/mautrix-signal/start.yml b/mautrix-signal/start.yml index baf7606..0971731 100644 --- a/mautrix-signal/start.yml +++ b/mautrix-signal/start.yml @@ -5,7 +5,7 @@ - name: Check mautrix-signal directory stat: path: /dc/mautrix-signal - register: mautrix-signal_dc_dir_stat + register: mautrixsignal_dc_dir_stat - name: Create mautrix-signal dc directory file: @@ -14,7 +14,7 @@ mode: 0755 group: root owner: root - when: mautrix-signal_dc_dir_stat.islnk is not defined + when: mautrixsignal_dc_dir_stat.islnk is not defined - name: Copy compose file copy: diff --git a/mautrix-signal/stop.yml b/mautrix-signal/stop.yml index a83188b..72e0e79 100644 --- a/mautrix-signal/stop.yml +++ b/mautrix-signal/stop.yml @@ -2,5 +2,5 @@ - hosts: teier.eu gather_facts: no tasks: - - name: Stop Mariadb - shell: "cd /dc/mariadb && docker-compose stop" \ No newline at end of file + - name: Stop Mautrix Signal + shell: "cd /dc/mautrix-signal && docker-compose stop" \ No newline at end of file diff --git a/mautrix-signal/teardown.yml b/mautrix-signal/teardown.yml index d05493f..0dbe887 100644 --- a/mautrix-signal/teardown.yml +++ b/mautrix-signal/teardown.yml @@ -2,5 +2,5 @@ - hosts: teier.eu gather_facts: no tasks: - - name: Teardown mariadb - shell: "cd /dc/mariadb && docker-compose down" \ No newline at end of file + - name: Teardown Mautrix Signal + shell: "cd /dc/mautrix-signal && docker-compose down" \ No newline at end of file diff --git a/mautrix-whatsapp/docker-compose.yml b/mautrix-whatsapp/docker-compose.yml new file mode 100644 index 0000000..d012fd9 --- /dev/null +++ b/mautrix-whatsapp/docker-compose.yml @@ -0,0 +1,15 @@ +version: '2.4' +services: + mautrix-whatsapp: + image: dock.mau.dev/tulir/mautrix-whatsapp:latest + restart: unless-stopped + volumes: + - /var/mautrix-whatsapp:/data + networks: + - matrix_net + +networks: + matrix_net: + name: matrix_net + driver: bridge + \ No newline at end of file diff --git a/mautrix-whatsapp/start.yml b/mautrix-whatsapp/start.yml new file mode 100644 index 0000000..8ff0ba0 --- /dev/null +++ b/mautrix-whatsapp/start.yml @@ -0,0 +1,25 @@ +--- +- hosts: teier.eu + gather_facts: no + tasks: + - name: Check mautrix-whatsapp directory + stat: + path: /dc/mautrix-whatsapp + register: mautrixwhatsapp_dc_dir_stat + + - name: Create mautrix-whatsapp dc directory + file: + path: /dc/mautrix-whatsapp + state: directory + mode: 0755 + group: root + owner: root + when: mautrixwhatsapp_dc_dir_stat.islnk is not defined + + - name: Copy compose file + copy: + src: docker-compose.yml + dest: /dc/mautrix-whatsapp + + - name: Start mautrix-whatsapp + shell: "cd /dc/mautrix-whatsapp && docker-compose up -d" diff --git a/mautrix-whatsapp/stop.yml b/mautrix-whatsapp/stop.yml new file mode 100644 index 0000000..84be03e --- /dev/null +++ b/mautrix-whatsapp/stop.yml @@ -0,0 +1,6 @@ +--- +- hosts: teier.eu + gather_facts: no + tasks: + - name: Stop mautrix-whatsapp + shell: "cd /dc/mautrix-whatsapp && docker-compose stop" \ No newline at end of file diff --git a/mautrix-whatsapp/teardown.yml b/mautrix-whatsapp/teardown.yml new file mode 100644 index 0000000..90a1b72 --- /dev/null +++ b/mautrix-whatsapp/teardown.yml @@ -0,0 +1,6 @@ +--- +- hosts: teier.eu + gather_facts: no + tasks: + - name: Teardown mautrix-whatsapp + shell: "cd /dc/mautrix-whatsapp && docker-compose down" \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index bb48bf9..3115aa0 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -5,7 +5,7 @@ services: environment: POSTGRES_DB: nextcloud POSTGRES_USER: nextcloud - POSTGRES_HOST: mariadb + POSTGRES_HOST: postgres POSTGRES_PASSWORD: ${POSTGRES_DB_PASSWORD} TRUSTED_PROXIES: "cloud.teier.eu 138.201.74.231 172.0.0.1/8" APACHE_DISABLE_REWRITE_IP: "1" @@ -33,6 +33,6 @@ networks: nextcloud_net: name: "nextcloud_net" driver: bridge - mariadb_net: + postgres_net: name: "postgres_net" external: true diff --git a/nextcloud/init.yml b/nextcloud/init.yml index 3847a1c..5a92ebf 100644 --- a/nextcloud/init.yml +++ b/nextcloud/init.yml @@ -2,15 +2,19 @@ - hosts: teier.eu gather_facts: no tasks: + - name: Install psycopg2 + shell: pip install psycopg2-binary - name: Create database for nextcloud community.postgresql.postgresql_db: + login_host: 127.0.0.1 login_user: postgres login_password: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" name: nextcloud state: present - name: Create database user for nextcloud - community.postgresql.postgresql_user:: + community.postgresql.postgresql_user: + login_host: 127.0.0.1 login_user: postgres login_password: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" name: nextcloud diff --git a/nextcloud/update.yml b/nextcloud/update.yml new file mode 100644 index 0000000..0539051 --- /dev/null +++ b/nextcloud/update.yml @@ -0,0 +1,10 @@ +--- +- hosts: teier.eu + gather_facts: no + tasks: + - name: Teardown nextcloud + shell: "cd /dc/nextcloud && docker-compose down" + - name: Update nextcloud + shell: "cd /dc/nextcloud && docker-compose pull" + - name: Start nextcloud + shell: "cd /dc/nextcloud && docker-compose up -d" diff --git a/nginx/sites/website b/nginx/sites/website index 283edb6..c7352c4 100644 --- a/nginx/sites/website +++ b/nginx/sites/website @@ -8,26 +8,14 @@ server { listen 443 ssl http2; server_name teier.eu www.teier.eu; + root /var/www/html/website; + index index.html; + ssl on; ssl_certificate /etc/letsencrypt/live/teier.eu/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/teier.eu/privkey.pem; location / { - proxy_pass http://127.0.0.1:8080/; - proxy_redirect off; - - proxy_pass_header Authorization; - proxy_set_header Referer $http_referer; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_http_version 1.1; - proxy_set_header Connection ""; - proxy_buffering off; - proxy_request_buffering off; - client_max_body_size 0; - proxy_read_timeout 36000s; - proxy_ssl_session_reuse off; + try_files $uri $uri/ =404; } } \ No newline at end of file diff --git a/nummus/init.yml b/nummus/init.yml index 9a84624..3f1be44 100644 --- a/nummus/init.yml +++ b/nummus/init.yml @@ -2,15 +2,19 @@ - hosts: teier.eu gather_facts: no tasks: + - name: Install psycopg2 + shell: pip install psycopg2-binary - name: Create database for Nummus - community.postgresql.postgresql_db - login_user: root + community.postgresql.postgresql_db: + login_host: 127.0.0.1 + login_user: postgres login_password: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" name: nummus state: present - name: Create database user for Nummus community.postgresql.postgresql_user: + login_host: 127.0.0.1 login_user: postgres login_password: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" name: "nummus" diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml index 1506ccd..329aa0f 100644 --- a/postgres/docker-compose.yml +++ b/postgres/docker-compose.yml @@ -12,6 +12,6 @@ services: ports: - 5432:5432 networks: - mariadb_net: + postgres_net: name: postgres_net driver: bridge diff --git a/postgres/start.yml b/postgres/start.yml index 47be434..323ea75 100644 --- a/postgres/start.yml +++ b/postgres/start.yml @@ -7,7 +7,7 @@ path: /dc/postgres register: postgres_dc_dir_stat - - name: Create mariadb dc directory + - name: Create postgres dc directory file: path: /dc/postgres state: directory @@ -22,6 +22,6 @@ dest: /dc/postgres - name: Start postgres - shell: "cd /dc/mariadb && docker-compose up -d" + shell: "cd /dc/postgres && docker-compose up -d" environment: POSTGRES_PASSWORD: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml index a987173..a95a723 100644 --- a/synapse/docker-compose.yml +++ b/synapse/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.4' services: synapse: - image: matrixdotorg/synapse:latest + image: matrixdotorg/synapse:v1.26.0-deb restart: always healthcheck: test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"] @@ -9,17 +9,22 @@ services: timeout: 10s retries: 3 ports: - - 8008:8008 + - 8008:8008 environment: SYNAPSE_SERVER_NAME: matrix.teier.eu volumes: - - /var/synapse:/data - - /var/mautrix-telegram:/mautrix-telegram - network: - - matrix_net + - /var/synapse:/data + - /var/mautrix-telegram:/mautrix-telegram + - /var/mautrix-signal:/mautrix-signal + - /var/mautrix-whatsapp:/mautrix-whatsapp + networks: + - matrix_net + - postgres_net networks: - matrix_net: - name: matrix_net - driver: bridge - \ No newline at end of file + matrix_net: + name: matrix_net + driver: bridge + postgres_net: + name: postgres_net + external: true \ No newline at end of file diff --git a/website/html/impressum.html b/website/html/impressum.html new file mode 100644 index 0000000..267c4f7 --- /dev/null +++ b/website/html/impressum.html @@ -0,0 +1,98 @@ + + + +
+ +
+ Informationspflicht laut §5 E-Commerce Gesetz, §14 Unternehmensgesetzbuch, §63 Gewerbeordnung und Offenlegungspflicht laut §25 Mediengesetz.
+
+ Mathias Teier
+ Baierdorf 33,
+ 3720 Baierdorf,
+ Österreich
+ Tel.: +43660/2622472
+ E-Mail: teier@kagent.at
+
+ EU-Streitschlichtung
+
+ Angaben zur Online-Streitbeilegung: Verbraucher haben die Möglichkeit, Beschwerden an die OnlineStreitbeilegungsplattform der EU zu richten: https://ec.europa.eu/consumers/odr/main/index.cfm?event=main.home2.show&lng=DE. Sie können allfällige Beschwerde auch an die oben angegebene E-Mail-Adresse richten.
+ Haftung für Inhalte dieser Webseite
+
+ Wir entwickeln die Inhalte dieser Webseite ständig weiter und bemühen uns korrekte und aktuelle Informationen bereitzustellen. Leider können wir keine Haftung für die Korrektheit aller Inhalte auf dieser Webseite übernehmen, speziell für jene die seitens Dritter bereitgestellt wird. Sollten Ihnen problematische oder rechtswidrige Inhalte auffallen, bitte wir Sie uns umgehend zu kontaktieren, Sie finden die Kontaktdaten im Impressum.
+ Haftung für Links auf dieser Webseite
+
+ Unsere Webseite enthält Links zu anderen Webseiten für deren Inhalt wir nicht verantwortlich sind. Wenn Ihnen rechtswidrige Links auf unserer Webseite auffallen, bitte wir Sie uns zu kontaktieren, Sie finden die Kontaktdaten im Impressum.
+ Urheberrechtshinweis
+
+ Alle Inhalte dieser Webseite (Bilder, Fotos, Texte, Videos) unterliegen dem Urheberrecht. Falls notwendig, werden wir die unerlaubte Nutzung von Teilen der Inhalte unserer Seite rechtlich verfolgen.
+
+
+ Datenschutzerklärung
+
+ Wir haben diese Datenschutzerklärung (Fassung 19.01.2021-221139960) verfasst, um Ihnen gemäß der Vorgaben der Datenschutz-Grundverordnung (EU) 2016/679 zu erklären, welche Informationen wir sammeln, wie wir Daten verwenden und welche Entscheidungsmöglichkeiten Sie als Besucher dieser Webseite haben.
+
+ Diese Webseite speichert keine Cookies und speichert keine Daten abgesehen von temporären Zugriffs-Logs des Web-Servers. Diese Logs werden regelmäßig geleert.
+
+ Ihnen stehen laut den Bestimmungen der DSGVO und des österreichischen Datenschutzgesetzes (DSG) grundsätzlich die folgende Rechte zu:
+
+
Ing. Mathias Teier — mathias.teier@cloudflight.io — +43660/2622472
+
+ Be excellent to each other and do exceptional things.
I'm driven by new challenges and motivated by finding solutions to these challenges. No matter
+ if it's that new project or that hard university course, always keep learning and improving!
+
In software engineering I'm most experienced in Spring Boot microservice development, but in recent project I also got more familiar with Golang and .NET. Golang turned out + to be a quick and clean way to implement small services for continous automation and .NET makes it really fast and simple to build frontends thanks to Blazor. +
+In SRE I did projects concerning OpenShfit migration, Ansible automation, writing Ansible plugins, implementing services for continous + automation and much more. +
+In my studies I primarily learn about English linguistics, cultural studies, human geogpraphy and pedagogy theory. I also learn about the basics of + anglophone literature, physical geography, cartography and geographic information systems. +
+At Cloudflight I started out with Spring Boot backend development and React.JS frontend development in small scale projects. Later on I worked on + ElasticSearch upgrades and OpenShift migrations getting more and more into site reliability engineering. In my current projects I work on services for continous + automation. +
+During my internship at HitBox, a former Viennese live streaming service, I worked in Node.JS backend development and test automatisation
+Ing. Mathias Teier — mathias.teier@cloudflight.io — +43660/2622472 + — Impressum
+