From 385a4a0b026d75493ac3875e0a3677f922316aa2 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 8 Oct 2020 17:51:52 +0200 Subject: [PATCH] review variable for virtual machine --- group_vars/VMServer | 153 +++++++++++++++++++++++++++++++++++++++++ group_vars/server | 5 ++ host_vars/VMAS-BUILD | 156 +----------------------------------------- host_vars/VMAS-HML | 158 +------------------------------------------ host_vars/oscar | 4 -- staging | 5 +- 6 files changed, 164 insertions(+), 317 deletions(-) create mode 100644 group_vars/VMServer diff --git a/group_vars/VMServer b/group_vars/VMServer new file mode 100644 index 0000000..3904d98 --- /dev/null +++ b/group_vars/VMServer @@ -0,0 +1,153 @@ +ttrss_url_path: http://{{inventory_hostname}}/tt-rss/ +system_upgrade: true +gitea_http_domain: "{{inventory_hostname}}" +gitea_root_url: http://{{inventory_hostname}}:3000 + +certbot_create_if_missing: false + +nextcloud_trusted_domains: + - localhost + - "{{inventory_hostname}}" +nextcloud_config_options: # additional options to set in config.php + - option: overwrite.cli.url + value: "'http://{{inventory_hostname}}'" + - option: maintenance + value: "false" + - option: loglevel + value: "'2'" + - option: installed + value: "true" + +nginx_upstreams: + - name: PHP-handler + servers: + - unix:/var/run/php-fpm/php-fpm.sock + +nginx_vhosts: + - listen: "80" + server_name: "_" + filename: "default.conf" + state: "present" + template: "{{ nginx_vhost_template }}" + extra_parameters: | + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; + fastcgi_hide_header X-Powered-By; + + root /usr/share/nginx/html; + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + location =/ { + rewrite ^ /starter; + } + location / { + rewrite ^/.well-known/carddav /radicale/$remote_user/carddav/ redirect; + rewrite ^/.well-known/caldav /radicale/$remote_user/caldav/ redirect; + + index index.php index.html index.htm ; + default_type text/html; + + } + location /radicale/ + { + # The trailing / is important! + proxy_pass http://localhost:5232/; # The / is important! + proxy_set_header X-Script-Name /radicale; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_header Authorization; + } + location ~ \.php$ { + # try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:/run/php-fpm/php-fpm.sock; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_read_timeout 800; + fastcgi_index index.php; + include fastcgi_params; + } + + location = /.well-known/carddav { + return 301 $scheme://$host:$server_port/nextcloud/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host:$server_port/nextcloud/remote.php/dav; + } + + location /.well-known/acme-challenge { } + + location ^~ /nextcloud { + + # set max upload size + client_max_body_size 512M; + fastcgi_buffers 64 4K; + + # Enable gzip but do not remove ETag headers + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + + location /nextcloud { + rewrite ^ /nextcloud/index.php; + } + + location ~ ^\/nextcloud\/(?:build|tests|config|lib|3rdparty|templates|data)\/ { + deny all; + } + location ~ ^\/nextcloud\/(?:\.|autotest|occ|issue|indie|db_|console) { + deny all; + } + + location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { + fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; + set $path_info $fastcgi_path_info; + try_files $fastcgi_script_name =404; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $path_info; + #fastcgi_param HTTPS on; + # Avoid sending the security headers twice + fastcgi_param modHeadersAvailable true; + # Enable pretty urls + fastcgi_param front_controller_active true; + fastcgi_pass php-handler; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ ^\/nextcloud\/(?:updater|oc[ms]-provider)(?:$|\/) { + try_files $uri/ =404; + index index.php; + } + + location ~ ^\/nextcloud\/.+[^\/]\.(?:css|js|woff2?|svg|gif|map)$ { + try_files $uri /nextcloud/index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; + + access_log off; + } + + location ~ ^\/nextcloud\/.+[^\/]\.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { + try_files $uri /nextcloud/index.php$request_uri; + # Optional: Don't log access to other assets + access_log off; + } + } + \ No newline at end of file diff --git a/group_vars/server b/group_vars/server index 0a8743d..8f2f06b 100644 --- a/group_vars/server +++ b/group_vars/server @@ -480,3 +480,8 @@ keystodeploy: pihole_admin_password: "{{ vault_pihole_admin }}" pihole_local_resolver: 192.168.1.10 pihole_local_domain: "{{ domain.name }}" + +ttrss_url_path: "https://www.{{domain.name}}/tt-rss" +gitea_http_domain: git.{{domain.name}} +gitea_root_url: https://git.{{domain.name}} +certbot_force: false \ No newline at end of file diff --git a/host_vars/VMAS-BUILD b/host_vars/VMAS-BUILD index 77f502a..eec993a 100644 --- a/host_vars/VMAS-BUILD +++ b/host_vars/VMAS-BUILD @@ -1,156 +1,2 @@ -ttrss_url_path: http://vmas-build/tt-rss/ -gitea_http_domain: vmas-build -gitea_root_url: http://vmas-build:3000 - -chainetv_repo_branch: dev - -certbot_create_if_missing: false - -nextcloud_trusted_domains: - - localhost - - vmas-build -nextcloud_config_options: # additional options to set in config.php - - option: overwrite.cli.url - value: "'http://vmas-build'" - - option: maintenance - value: "false" - - option: loglevel - value: "'2'" - - option: installed - value: "true" - -nginx_upstreams: - - name: PHP-handler - servers: - - unix:/var/run/php-fpm/php-fpm.sock - -nginx_vhosts: - - listen: "80" - server_name: "_" - filename: "default.conf" - state: "present" - template: "{{ nginx_vhost_template }}" - extra_parameters: | - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header Referrer-Policy no-referrer; - fastcgi_hide_header X-Powered-By; - - root /usr/share/nginx/html; - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - location =/ { - rewrite ^ /starter; - } - location / { - rewrite ^/.well-known/carddav /radicale/$remote_user/carddav/ redirect; - rewrite ^/.well-known/caldav /radicale/$remote_user/caldav/ redirect; - - index index.php index.html index.htm ; - default_type text/html; - - } - location /radicale/ - { - # The trailing / is important! - proxy_pass http://localhost:5232/; # The / is important! - proxy_set_header X-Script-Name /radicale; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Authorization; - } - location ~ \.php$ { - # try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/php-fpm/php-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_read_timeout 800; - fastcgi_index index.php; - include fastcgi_params; - } - - location = /.well-known/carddav { - return 301 $scheme://$host:$server_port/nextcloud/remote.php/dav; - } - location = /.well-known/caldav { - return 301 $scheme://$host:$server_port/nextcloud/remote.php/dav; - } - - location /.well-known/acme-challenge { } - - location ^~ /nextcloud { - - # set max upload size - client_max_body_size 512M; - fastcgi_buffers 64 4K; - - # Enable gzip but do not remove ETag headers - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - - location /nextcloud { - rewrite ^ /nextcloud/index.php; - } - - location ~ ^\/nextcloud\/(?:build|tests|config|lib|3rdparty|templates|data)\/ { - deny all; - } - location ~ ^\/nextcloud\/(?:\.|autotest|occ|issue|indie|db_|console) { - deny all; - } - - location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { - fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - #fastcgi_param HTTPS on; - # Avoid sending the security headers twice - fastcgi_param modHeadersAvailable true; - # Enable pretty urls - fastcgi_param front_controller_active true; - fastcgi_pass php-handler; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - } - - location ~ ^\/nextcloud\/(?:updater|oc[ms]-provider)(?:$|\/) { - try_files $uri/ =404; - index index.php; - } - - location ~ ^\/nextcloud\/.+[^\/]\.(?:css|js|woff2?|svg|gif|map)$ { - try_files $uri /nextcloud/index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header Referrer-Policy no-referrer; - - access_log off; - } - - location ~ ^\/nextcloud\/.+[^\/]\.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { - try_files $uri /nextcloud/index.php$request_uri; - # Optional: Don't log access to other assets - access_log off; - } - } - - \ No newline at end of file +chainetv_repo_branch: dev \ No newline at end of file diff --git a/host_vars/VMAS-HML b/host_vars/VMAS-HML index c4afe4d..ed8158a 100644 --- a/host_vars/VMAS-HML +++ b/host_vars/VMAS-HML @@ -1,158 +1,2 @@ -##ansible_python_interpreter: /usr/bin/python2 -##music_directory: '/mnt/diskstation/music' -ttrss_url_path: http://vmas-hml/tt-rss/ -system_upgrade: true - -gitea_http_domain: vmas-hml -gitea_root_url: http://vmas-hml:3000 - -chainetv_repo_branch: master - -nextcloud_trusted_domains: - - localhost - - vmas-hml -nextcloud_config_options: # additional options to set in config.php - - option: overwrite.cli.url - value: "'http://vmas-hml'" - - option: maintenance - value: "false" - - option: loglevel - value: "'2'" - - option: installed - value: "true" - -certbot_create_if_missing: false -nginx_upstreams: - - name: PHP-handler - servers: - - unix:/var/run/php-fpm/php-fpm.sock - -nginx_vhosts: - - listen: "80" - server_name: "_" - filename: "default.conf" - state: "present" - template: "{{ nginx_vhost_template }}" - extra_parameters: | - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header Referrer-Policy no-referrer; - fastcgi_hide_header X-Powered-By; - - root /usr/share/nginx/html; - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - location =/ { - rewrite ^ /starter; - } - location / { - rewrite ^/.well-known/carddav /radicale/$remote_user/carddav/ redirect; - rewrite ^/.well-known/caldav /radicale/$remote_user/caldav/ redirect; - - index index.php index.html index.htm ; - default_type text/html; - - } - location /radicale/ - { - # The trailing / is important! - proxy_pass http://localhost:5232/; # The / is important! - proxy_set_header X-Script-Name /radicale; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Authorization; - } - location ~ \.php$ { - # try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/php-fpm/php-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_read_timeout 800; - fastcgi_index index.php; - include fastcgi_params; - } - - location = /.well-known/carddav { - return 301 $scheme://$host:$server_port/nextcloud/remote.php/dav; - } - location = /.well-known/caldav { - return 301 $scheme://$host:$server_port/nextcloud/remote.php/dav; - } - - location /.well-known/acme-challenge { } - - location ^~ /nextcloud { - - # set max upload size - client_max_body_size 512M; - fastcgi_buffers 64 4K; - - # Enable gzip but do not remove ETag headers - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - - location /nextcloud { - rewrite ^ /nextcloud/index.php; - } - - location ~ ^\/nextcloud\/(?:build|tests|config|lib|3rdparty|templates|data)\/ { - deny all; - } - location ~ ^\/nextcloud\/(?:\.|autotest|occ|issue|indie|db_|console) { - deny all; - } - - location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { - fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; - set $path_info $fastcgi_path_info; - try_files $fastcgi_script_name =404; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $path_info; - #fastcgi_param HTTPS on; - # Avoid sending the security headers twice - fastcgi_param modHeadersAvailable true; - # Enable pretty urls - fastcgi_param front_controller_active true; - fastcgi_pass php-handler; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - } - - location ~ ^\/nextcloud\/(?:updater|oc[ms]-provider)(?:$|\/) { - try_files $uri/ =404; - index index.php; - } - - location ~ ^\/nextcloud\/.+[^\/]\.(?:css|js|woff2?|svg|gif|map)$ { - try_files $uri /nextcloud/index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header Referrer-Policy no-referrer; - - access_log off; - } - - location ~ ^\/nextcloud\/.+[^\/]\.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { - try_files $uri /nextcloud/index.php$request_uri; - # Optional: Don't log access to other assets - access_log off; - } - } - - \ No newline at end of file +chainetv_repo_branch: master \ No newline at end of file diff --git a/host_vars/oscar b/host_vars/oscar index 6af6572..e69de29 100644 --- a/host_vars/oscar +++ b/host_vars/oscar @@ -1,4 +0,0 @@ -ttrss_url_path: "https://www.{{domain.name}}/tt-rss" -gitea_http_domain: git.{{domain.name}} -gitea_root_url: https://git.{{domain.name}} -certbot_force: false \ No newline at end of file diff --git a/staging b/staging index 5e7d1dc..991ce6e 100644 --- a/staging +++ b/staging @@ -4,7 +4,10 @@ VMAW [laptop] VMAW -[server] +[server:children] +VMServer + +[VMServer] VMAS-HML VMAS-BUILD