diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/malabaricus.yml | 15 | ||||
| -rw-r--r-- | ansible/minio.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/minio-server/tasks/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/nginx/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nginx/handlers/main.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/nginx/tasks/main.yml | 32 | ||||
| -rw-r--r-- | ansible/templates/nginx/malabaricus/sites-enabled/default | 163 | ||||
| -rw-r--r-- | ansible/templates/nginx/malabaricus/sites-enabled/minio | 35 |
8 files changed, 259 insertions, 10 deletions
diff --git a/ansible/malabaricus.yml b/ansible/malabaricus.yml new file mode 100644 index 0000000..6f4c5af --- /dev/null +++ b/ansible/malabaricus.yml @@ -0,0 +1,15 @@ +- hosts: + - malabaricus + roles: + - minio-server + - role: nginx + nginx__template: + - sites-enabled/default + - sites-enabled/minio + ipv6: "[::]:80" + server_name: minio.trygvis.io + +- hosts: + - all !malabaricus # no binaries for arm + roles: + - minio-bin diff --git a/ansible/minio.yml b/ansible/minio.yml deleted file mode 100644 index 20faae9..0000000 --- a/ansible/minio.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: - - birgitte - - malabaricus - roles: - - minio-server - -- hosts: - - all !malabaricus # no binaries for arm - roles: - - minio-bin diff --git a/ansible/roles/minio-server/tasks/main.yml b/ansible/roles/minio-server/tasks/main.yml index f2df91d..b94b00a 100644 --- a/ansible/roles/minio-server/tasks/main.yml +++ b/ansible/roles/minio-server/tasks/main.yml @@ -35,6 +35,7 @@ name: "{{ user }}" group: "{{ group }}" system: yes + shell: /bin/bash - file: path: "{{ item }}" diff --git a/ansible/roles/nginx/defaults/main.yml b/ansible/roles/nginx/defaults/main.yml new file mode 100644 index 0000000..fe42c1b --- /dev/null +++ b/ansible/roles/nginx/defaults/main.yml @@ -0,0 +1,2 @@ +nginx__copy: +nginx__template: diff --git a/ansible/roles/nginx/handlers/main.yml b/ansible/roles/nginx/handlers/main.yml new file mode 100644 index 0000000..039e72b --- /dev/null +++ b/ansible/roles/nginx/handlers/main.yml @@ -0,0 +1,11 @@ +- name: systemctl reload nginx + become: yes + systemd: + name: nginx + state: reloaded + +- name: systemctl restart nginx + become: yes + systemd: + name: nginx + state: restarted diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml new file mode 100644 index 0000000..bbe6da7 --- /dev/null +++ b/ansible/roles/nginx/tasks/main.yml @@ -0,0 +1,32 @@ +- become: yes + tags: + - nginx + block: + - name: packages + vars: + items: + - nginx + apt: + name: "{{ items }}" + install_recommends: no + +- become: yes + tags: + - nginx + - nginx-config + block: + - name: "fill /etc/nginx" + with_items: "{{ nginx__copy }}" + when: item is defined and item + notify: systemctl reload nginx + copy: + dest: "/etc/nginx/{{ item }}" + src: "nginx/{{ ansible_hostname }}/{{ item }}" + + - name: "fill /etc/nginx" + with_items: "{{ nginx__template }}" + when: item is defined and item + notify: systemctl reload nginx + template: + dest: "/etc/nginx/{{ item }}" + src: "nginx/{{ ansible_hostname }}/{{ item }}" diff --git a/ansible/templates/nginx/malabaricus/sites-enabled/default b/ansible/templates/nginx/malabaricus/sites-enabled/default new file mode 100644 index 0000000..7bb9d9a --- /dev/null +++ b/ansible/templates/nginx/malabaricus/sites-enabled/default @@ -0,0 +1,163 @@ +## +# You should look at the following URL's in order to grasp a solid understanding +# of Nginx configuration files in order to fully unleash the power of Nginx. +# https://www.nginx.com/resources/wiki/start/ +# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/ +# https://wiki.debian.org/Nginx/DirectoryStructure +# +# In most cases, administrators will remove this file from sites-enabled/ and +# leave it as reference inside of sites-available where it will continue to be +# updated by the nginx packaging team. +# +# This file will automatically load configuration files provided by other +# applications, such as Drupal or Wordpress. These applications will be made +# available underneath a path with that package name, such as /drupal8. +# +# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. +## + +upstream php-handler { +# include snippets/fastcgi-php.conf; +# fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; + server unix:/var/run/php/php7.0-fpm.sock; +} + +# Default server configuration +# + +server { + listen 80; + listen [::]:80; + server_name malabaricus.trygvis.io; + # enforce https + return 301 https://$server_name$request_uri; +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name malabaricus.trygvis.io; + + ssl_certificate /etc/letsencrypt/live/malabaricus.trygvis.io/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/malabaricus.trygvis.io/privkey.pem; + + root /var/www/html/nextcloud; + + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # The following 2 rules are only needed for the user_webfinger app. + # Uncomment it if you're planning to use this app. + #rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + + + location = /.well-known/carddav { + return 301 $scheme://$host/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host/remote.php/dav; + } + location ~ ^/.well-known/acme-challenge { + allow all; + } + + # 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 / { + rewrite ^ /index.php$request_uri; + } + + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { + deny all; + } + location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { + deny all; + } + + location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param HTTPS on; + #Avoid sending the security headers twice + fastcgi_param modHeadersAvailable true; + fastcgi_param front_controller_active true; + fastcgi_pass php-handler; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ ^/(?:updater|ocs-provider)(?:$|/) { + try_files $uri/ =404; + index index.php; + } + + # Adding the cache control header for js and css files + # Make sure it is BELOW the PHP block + location ~ \.(?:css|js|woff2?|svg|gif)$ { + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + # Add headers to serve security related headers (It is intended to + # have those duplicated to the ones above) + # Before enabling Strict-Transport-Security headers please read into + # this topic first. + # add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;"; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + 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; + + # Optional: Don't log access to assets + access_log off; + } + + location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ { + try_files $uri /index.php$request_uri; + # Optional: Don't log access to other assets + access_log off; + } +} + + +# Virtual Host configuration for example.com +# +# You can move that to a different file under sites-available/ and symlink that +# to sites-enabled/ to enable it. +# +#server { +# listen 80; +# listen [::]:80; +# +# server_name example.com; +# +# root /var/www/example.com; +# index index.html; +# +# location / { +# try_files $uri $uri/ =404; +# } +#} diff --git a/ansible/templates/nginx/malabaricus/sites-enabled/minio b/ansible/templates/nginx/malabaricus/sites-enabled/minio new file mode 100644 index 0000000..9855e49 --- /dev/null +++ b/ansible/templates/nginx/malabaricus/sites-enabled/minio @@ -0,0 +1,35 @@ +# vim: filetype=jinja + +server { +{% if ipv6 is defined %} + listen {{ ipv6 }}; +{% endif %} +{% if ipv4 is defined %} + listen {{ ipv4 }}; +{% endif %} +{% if server_name is defined %} + server_name {{ server_name }}; +{% else %} + server_name _; +{% endif %} + + ignore_invalid_headers off; + # Allow any size file to be uploaded. + # Set to a value such as 1000m; to restrict file size to a specific value + client_max_body_size 0; + # To disable buffering + proxy_buffering off; + + root /var/www/html; + + location / { + try_files $uri @proxy; + } + + location @proxy { + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://127.0.0.1:9000; + } +} |