diff --git a/.htaccess b/.htaccess index 5068849..2d30b66 100644 --- a/.htaccess +++ b/.htaccess @@ -1,13 +1,8 @@ # Charset AddDefaultCharset UTF-8 -# Enable gzip - - AddOutputFilterByType DEFLATE 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/wasm 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 - - # Site-Icon Rules -RewriteRule ^favicon\.ico$ img/favicon.ico [R=301,L] +RewriteRule ^favicon\.ico$ /img/favicon.ico [L] # Caching @@ -19,8 +14,6 @@ RewriteRule ^favicon\.ico$ img/favicon.ico [R=301,L] -DirectoryIndex index.html index.htm - # Robots.txt Allow from all @@ -28,14 +21,9 @@ DirectoryIndex index.html index.htm Satisfy all -# Shorturl -RewriteRule ^[a-zA-Z0-9]{6}$ https://go.p-schwarz.de [P] - # Spaceapi RewriteRule ^spaceapi.json$ /spaceapi/ [R=302,L] RewriteRule ^spaceapi$ /spaceapi/ [R=302,L] -RewriteRule ^spaceapi/(.*)$ https://spaceapi.ctbk.de/$1 [P] # Hackcal -RewriteRule ^hackcal$ /hackcal/ [R=302,L] -RewriteRule ^hackcal/(.*)$ https://hackcal.ctbk.de/$1 [P] +RewriteRule ^hackcal$ /hackcal/ [R=302,L] \ No newline at end of file diff --git a/README.md b/README.md index b625aa2..daf7a0f 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,37 @@ } index index.html index.htm; + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Spaceapi + location = /spaceapi.json { + return 302 /spaceapi/; + } + location = /spaceapi { + return 302 /spaceapi/; + } + location /spaceapi/ { + proxy_pass https://spaceapi.ctbk.de/; + } + + # Hackcal + location = /hackcal { + return 302 /hackcal/; + } + location /hackcal/ { + proxy_pass https://hackcal.ctbk.de/; + } + ``` +## Apache/Netcup +Da Netcup keine nginx Configanpassungen und kein Reverse Proxy zulässt, gibt es noch eine .htaccess und die Ordner spaceapi und hackcal mit jeweils einem Proxyscript + ## Minify resources ``` diff --git a/hackcal/index.php b/hackcal/index.php new file mode 100644 index 0000000..abcb0dc --- /dev/null +++ b/hackcal/index.php @@ -0,0 +1,4 @@ + array('min_range' => 1, 'max_range' => 12))), 1); +echo file_get_contents("https://hackcal.ctbk.de/?period=".$period); \ No newline at end of file diff --git a/spaceapi/closed.png b/spaceapi/closed.png new file mode 100644 index 0000000..1cfcaf1 Binary files /dev/null and b/spaceapi/closed.png differ diff --git a/spaceapi/index.php b/spaceapi/index.php new file mode 100644 index 0000000..7a3f703 --- /dev/null +++ b/spaceapi/index.php @@ -0,0 +1,3 @@ +