-
Notifications
You must be signed in to change notification settings - Fork 270
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: improve handling of config files (#480)
* fix: improve handling of config file Signed-off-by: WrenIX <[email protected]> * change all the gotmpl file extensions to be tpl Signed-off-by: jessebot <[email protected]> --------- Signed-off-by: WrenIX <[email protected]> Signed-off-by: Jesse Hitch <[email protected]> Signed-off-by: jessebot <[email protected]> Co-authored-by: Jesse Hitch <[email protected]>
- Loading branch information
Showing
13 changed files
with
248 additions
and
263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # line below if for Apache 2.4 | ||
| <ifModule mod_authz_core.c> | ||
| Require all denied | ||
| </ifModule> | ||
| # line below if for Apache 2.2 | ||
| <ifModule !mod_authz_core.c> | ||
| deny from all | ||
| </ifModule> | ||
| # section for Apache 2.2 and 2.4 | ||
| <ifModule mod_autoindex.c> | ||
| IndexIgnore * | ||
| </ifModule> |
4 changes: 4 additions & 0 deletions
4
charts/nextcloud/files/defaultConfigs/apache-pretty-urls.config.php.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?php | ||
| $CONFIG = array ( | ||
| 'htaccess.RewriteBase' => '/', | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?php | ||
| $CONFIG = array ( | ||
| 'memcache.local' => '\OC\Memcache\APCu', | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?php | ||
| $CONFIG = array ( | ||
| "apps_paths" => array ( | ||
| 0 => array ( | ||
| "path" => OC::$SERVERROOT."/apps", | ||
| "url" => "/apps", | ||
| "writable" => false, | ||
| ), | ||
| 1 => array ( | ||
| "path" => OC::$SERVERROOT."/custom_apps", | ||
| "url" => "/custom_apps", | ||
| "writable" => true, | ||
| ), | ||
| ), | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?php | ||
| $autoconfig_enabled = false; | ||
| if (getenv('SQLITE_DATABASE')) { | ||
| $AUTOCONFIG["dbtype"] = "sqlite"; | ||
| $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); | ||
| $autoconfig_enabled = true; | ||
| } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { | ||
| $AUTOCONFIG["dbtype"] = "mysql"; | ||
| $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); | ||
| $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); | ||
| $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); | ||
| $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); | ||
| $autoconfig_enabled = true; | ||
| } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { | ||
| $AUTOCONFIG["dbtype"] = "pgsql"; | ||
| $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); | ||
| $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); | ||
| $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); | ||
| $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); | ||
| $autoconfig_enabled = true; | ||
| } | ||
| if ($autoconfig_enabled) { | ||
| $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; | ||
| } |
14 changes: 14 additions & 0 deletions
14
charts/nextcloud/files/defaultConfigs/redis.config.php.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?php | ||
| if (getenv('REDIS_HOST')) { | ||
| $CONFIG = array ( | ||
| 'memcache.distributed' => '\OC\Memcache\Redis', | ||
| 'memcache.locking' => '\OC\Memcache\Redis', | ||
| 'redis' => array( | ||
| 'host' => getenv('REDIS_HOST'), | ||
| 'port' => getenv('REDIS_HOST_PORT') ?: 6379, | ||
| {{- if .Values.redis.auth.enabled }} | ||
| 'password' => getenv('REDIS_HOST_PASSWORD'), | ||
| {{- end }} | ||
| ), | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?php | ||
| if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) { | ||
| $CONFIG = array ( | ||
| 'mail_smtpmode' => 'smtp', | ||
| 'mail_smtphost' => getenv('SMTP_HOST'), | ||
| 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), | ||
| 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', | ||
| 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), | ||
| 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', | ||
| 'mail_smtpname' => getenv('SMTP_NAME') ?: '', | ||
| 'mail_smtppassword' => getenv('SMTP_PASSWORD') ?: '', | ||
| 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), | ||
| 'mail_domain' => getenv('MAIL_DOMAIN'), | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| upstream php-handler { | ||
| server 127.0.0.1:9000; | ||
| } | ||
|
|
||
| server { | ||
| listen {{ .Values.nginx.containerPort }}; | ||
|
|
||
| # HSTS settings | ||
| # 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 Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; | ||
|
|
||
| # set max upload size | ||
| client_max_body_size 10G; | ||
| 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; | ||
|
|
||
| # Pagespeed is not supported by Nextcloud, so if your server is built | ||
| # with the `ngx_pagespeed` module, uncomment this line to disable it. | ||
| #pagespeed off; | ||
|
|
||
| # HTTP response headers borrowed from Nextcloud `.htaccess` | ||
| add_header Referrer-Policy "no-referrer" always; | ||
| add_header X-Content-Type-Options "nosniff" always; | ||
| add_header X-Download-Options "noopen" always; | ||
| add_header X-Frame-Options "SAMEORIGIN" always; | ||
| add_header X-Permitted-Cross-Domain-Policies "none" always; | ||
| add_header X-Robots-Tag "noindex, nofollow" always; | ||
| add_header X-XSS-Protection "1; mode=block" always; | ||
|
|
||
| # Remove X-Powered-By, which is an information leak | ||
| fastcgi_hide_header X-Powered-By; | ||
|
|
||
| # Add .mjs as a file extension for javascript | ||
| # Either include it in the default mime.types list | ||
| # or include you can include that list explicitly and add the file extension | ||
| # only for Nextcloud like below: | ||
| include mime.types; | ||
| types { | ||
| text/javascript js mjs; | ||
| } | ||
|
|
||
| # Path to the root of your installation | ||
| root /var/www/html; | ||
|
|
||
| # Specify how to handle directories -- specifying `/index.php$request_uri` | ||
| # here as the fallback means that Nginx always exhibits the desired behaviour | ||
| # when a client requests a path that corresponds to a directory that exists | ||
| # on the server. In particular, if that directory contains an index.php file, | ||
| # that file is correctly served; if it doesn't, then the request is passed to | ||
| # the front-end controller. This consistent behaviour means that we don't need | ||
| # to specify custom rules for certain paths (e.g. images and other assets, | ||
| # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus | ||
| # `try_files $uri $uri/ /index.php$request_uri` | ||
| # always provides the desired behaviour. | ||
| index index.php index.html /index.php$request_uri; | ||
|
|
||
| # Rule borrowed from `.htaccess` to handle Microsoft DAV clients | ||
| location = / { | ||
| if ( $http_user_agent ~ ^DavClnt ) { | ||
| return 302 /remote.php/webdav/$is_args$args; | ||
| } | ||
| } | ||
|
|
||
| location = /robots.txt { | ||
| allow all; | ||
| log_not_found off; | ||
| access_log off; | ||
| } | ||
|
|
||
| # Make a regex exception for `/.well-known` so that clients can still | ||
| # access it despite the existence of the regex rule | ||
| # `location ~ /(\.|autotest|...)` which would otherwise handle requests | ||
| # for `/.well-known`. | ||
| location ^~ /.well-known { | ||
| # The following 6 rules are borrowed from `.htaccess` | ||
| location = /.well-known/carddav { return 301 /remote.php/dav/; } | ||
| location = /.well-known/caldav { return 301 /remote.php/dav/; } | ||
| # Anything else is dynamically handled by Nextcloud | ||
| location ^~ /.well-known { return 301 /index.php$uri; } | ||
|
|
||
| try_files $uri $uri/ =404; | ||
| } | ||
|
|
||
| # Rules borrowed from `.htaccess` to hide certain paths from clients | ||
| location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } | ||
| location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } | ||
|
|
||
| # Ensure this block, which passes PHP files to the PHP process, is above the blocks | ||
| # which handle static assets (as seen below). If this block is not declared first, | ||
| # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` | ||
| # to the URI, resulting in a HTTP 500 error response. | ||
| location ~ \.php(?:$|/) { | ||
| # Required for legacy support | ||
| rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri; | ||
| 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; | ||
| fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice | ||
| fastcgi_param front_controller_active true; # Enable pretty urls | ||
| fastcgi_pass php-handler; | ||
| fastcgi_intercept_errors on; | ||
| fastcgi_request_buffering off; | ||
| } | ||
|
|
||
| location ~ \.(?:css|js|svg|gif)$ { | ||
| try_files $uri /index.php$request_uri; | ||
| expires 6M; # Cache-Control policy borrowed from `.htaccess` | ||
| access_log off; # Optional: Don't log access to assets | ||
| } | ||
| location ~ \.woff2?$ { | ||
| try_files $uri /index.php$request_uri; | ||
| expires 7d; # Cache-Control policy borrowed from `.htaccess` | ||
| access_log off; # Optional: Don't log access to assets | ||
| } | ||
|
|
||
| location / { | ||
| try_files $uri $uri/ /index.php$request_uri; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.