From 225e5d676a178f379375735a900807fcafb09278 Mon Sep 17 00:00:00 2001 From: Patrick Schwarz Date: Fri, 5 Apr 2024 20:19:17 +0200 Subject: [PATCH] Weitere Netcup-Anpassungen --- .htaccess | 16 ++-------------- README.md | 29 +++++++++++++++++++++++++++++ hackcal/index.php | 4 ++++ spaceapi/closed.png | Bin 0 -> 3042 bytes spaceapi/index.php | 3 +++ spaceapi/open.png | Bin 0 -> 2909 bytes 6 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 hackcal/index.php create mode 100644 spaceapi/closed.png create mode 100644 spaceapi/index.php create mode 100644 spaceapi/open.png 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 0000000000000000000000000000000000000000..1cfcaf1c2705dfda53e4bb53956a3ab9f8c5852a GIT binary patch literal 3042 zcma)8X*ARgAN?acQPh-eEM+UBo-)~&EZGKA##m;kkf*WlEn_SDl4PswqA-lmU`(PI zvWFOqC29-?L$;Xk_I!KZ_tSgMy}x_!IrqcwoZpvUf{oQRK|V1)000EdOpUJpQOZB$ z;rKH@yt*9sN8)TOZH@nlAi4hsttVyMPRNi&WjaNqdyh%=3rh|PNe&;C7!eew2#8Ja zpPuA9HO+f!mIw5m`y>r?mM(v30eW@G*k&2wvg+o|48pEIPTEL+u~l5QU0eU_BYAId z`1iND{k65j!$YCM7vw*y2nJoZx&a7Z(6{l6Of9HxnPJ*!xn=_Z-@ciVf$hDCm8q~$ zsyqnrb6;t~E1^fd(X35&B#-bT*1q1%2KNFw;75DCgkb+-d2VD?0a?pbDe=^F1lEn4 zryx8`k!yBJ#^xe+!M){TNB+UVf#h_^ul0Q@vSaMKYQk1p&6@@vOxr-qDb{a`hlCFY z(QVNYEpG>ejN$KHm(NKk{l2+;11_4nyhtxXtqHj@6L*rs;vUE7jWNmBwu3I8#JX1A zbBh4?Z>87FMUD%9TP(!uIea|jh74)u1$9E#Jac2ljwi^;CeD7up|x$qU!H3 zU}Pi)C`rDbM!>cZpYo9O@G;b>yspA zcz)KPzx;50Q1xc!nbv5n05<8Aob1@{4Rk#hKHvHtB0Iopi()}tS1=upuG^4R7&5hG zE}3uL+yj`C3j!+HwgoGnOyp!H(~>$0Zk~yJa@xGa8R_M2l)04k%baY|jAKVLuVzTw z+?9|w1fKq#@NQJPCV`t0XjT~uL9hdtqc}3q#fGcBM61kYHs zNA;{Oyv$Gq98O4fHa#47_n|V? z@I?ratSr6};DF2Jhn70`;P-bEJe#p>z~@*+9$;|H=XFvA?PoA+o$^kvr7OmfA8-~y zP?u72NLE?Zh-|3_mjO~T$$vM%B5$dOfAKddiR_}P!4ivoUB zc?cUYfm8#N*a3A9u3%H3&?h3IYOw=ltDA~R6 z*AY2(jHW{}D)R(a+N&HYsSi1J!f%L0ylW|oJ4938kGrb@rWSWpv=X}=>ABW86By~j z>y=-JJeb3rob`IVaErri)|DfQ9v0Iu3$?Gp#Cx$<`lnI(r?Ziofv+#HBK2;gVanK!uoPvG3vB#wEPd3f|PD&(n6-NKtv`-WbC#P*AT2S;Cv zcYb|b>swRe*zMyj6D&V$->wXUI$x}F?sFce#o~8OiD1)bU{rdnxU&1H9Tif|D-}Vd z3x(&EBEwKpdsv>xVgC7eF?w#`t=cmkkA3CaTEi`ujU-WER=Mq!)njl-d;@?P+O)Szh%q&v&+~%aQ%U< zfK+42><^BaK~Bt>_4M_Fm;5Kq`~CX63}9T_K`Bf6o0(w2%Sg1}M5zHcvD(v~yO^Ww z(fww|r#dy&mmYOnWiPk})ejzkmRH3>3V49X9oMXeWp;t7GmgqAn2tXp>gvl633);s zfb`Ho&e-}wy$C08CZJkUSQ=;@js0%vo=1GkU-2d6=5W39^z(j%OtD;I zN~O5>)4!(9Eu)^4N%$zsYFI$?BWdC9lEdNIwBX7Q<}*-FT4Ti6yYWHKDniO}5Yog; z+d!7vrb9CBc`OQ_qHbv-nj2^riUa8$tjwlB z0uz#Me|M`Ybn>2~Cea-rNcKoR3Ba&W{R)CwkCn;FS1eP3q=zi#(I0sdFPN9`^EL9G z1>!HL2l^qhZ_CeB)m`bq>w7DN&xt9JUhr#Mp}yDx6OhKu@}IN`gU#O39YvR# zoQq9rd>q^cbC#fbg-`{^BAb5dp2w)7NCgaUz{sc8XwZ9HEYsZXaYR2>9b;rjLBvZO+m=iep!`rmmczC+C!8=X5u&j)w0)C5{pF z`COp_ZDJs0lY;j$d>bdLT9X3b8|SlUUw`c(ZB=E{sOm-hNY$anYw4Et%9w+%04%zsy*{h zlem3VzizZW^kPn`4J2cl(ayf#SHEy#Crv4&M#xvaTsM=3yL>-h;`z7eZ;CcM{raG= zo&8i1JS3BdMCNmU#%m93$D;P!@mn$sUP@NfDtVqRC~M~^9syG4qO|&pSO@g znlwOfyF(geMtWm{>?*R27Uwcl1M?gwKseTw-?6q!2>4!HISWLzLU|BAs2a!8Z&bC^ zY0}#iA~YcCxRsNjGV-J_Mw_5#ZhwfX$PAqpc0aD*4GkdJeO4tFc<)HB@1_Lp>dySn z>HjNgF7C}3pl5`Z_CmBNAUo`B7opC*kM`^5T=i1t_qwH$xH}Fsr)hgOqTo}k9h=Gm z>*WnYxVCn!s@@awZDvxjV)$CIE^53UAu@^icEsYx#-9%vFf+C?!e71l=s(cG57Gbt literal 0 HcmV?d00001 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 @@ +E1&ie$FRz3;eH*lkqO2dfx#tQq!g9(&O_mDoF*O<63OSRu~-ZeOPV z+}xe{bFgu8aS>T;91`qy>7%J54Z_xEy4)sGH; zIndA0(&`VrFgUEunbZNK)W{^};}4wH@K(XL2$2_(z30E?Md3&d?X4;=bvWNWKp>uOTij|Y??+2I}-@^5<@wtMov z2CU=dCy0O;z3GfGXBL! zJC8CnV%B2e?_Mf^qooUb)k>fAP4!{G#ysxBuIyQx~7;@pcel-8NhqqA@m9x&OYD*5R zvmLKpbn+y!ob>^PMS~btj;O<_ztS2#*1pLBI)-ey!i=#D09e}r=ykw;v6Pm{HpPWV znuk-n%l!AiygV6Kg%+N)aV~Zx3hC6dCMma?2#`<~zssi??!M@TFkm3W0ynGk^u+8b zOQzeDFZQ{!dN7;*ICAZ1E}(N=^ojsnLJ*?rk;Gs&J#__U$5{%u6j^=3&%)K92O|=& z!Lfh&?y-;_ZnHP|^~jNg_~CtkPJ*wdu(q!v^)%n$21o$XUzgixm3M|ryu>*)(!8-kQCK?DbgtFYQ;fz1*{sYm{P;l(#La%8RcH98128D26Y z%8!VN32bCahejTging9y9mOJvAc{NyT!bbw_ckVi5&hXE$X$_$;sbg$+%TWPQoer` zEr>$ZKCTCmTt>pf#^?U@Y@^BkpFP(}cd{b1V1GN!-{@cUeS@t+LZQ4YX;RllXKs$1 z_Z@kxFystp<`5WU<{_6OE!GHuJA4$sTu3KVi~cvSw$_FQJFRZ(j$ zy3G;R;0a3Vrc}}1VHD6+XEjr9nIzh@$5Amfcdg1}5ozE_AFD<|p?GIWcvbb$HsQky4;aS>epZLW%hoAw@cmH!*3lFVJ*cu`F+P$LWUNNy#VM!G z9&G19b%l)UjSu4Dsw53w$7pY7f**!a&?0bmS^nkY;~H%nN~Pf`E&SUn3QC#(4fKK8OR#yqJ6tPKkGRt9zQ$y^D6b z;%B>k1PUa$O@v(l0G0U16J_iQ@o!ylKCi>)mXh<8!rtBzIS=Th9jOs#6g{Mjfg4Q; zGo?eMACeb7IrGG7)EjfGXpq<1K#TpoFXX7fR$h5U`p`=q@v`!&hQy7_37|_)7c%2o zo_&*(vbBQC=1mUHSz()Dg3(UJh#jtGGa+%FH{=UFGUD3UTvo>Npmwo$V*FezJ!P@i zopzM*HZ6zMnbk4CvnYw8dBj0qD~TXrJ7#ThQ`i)gdi@jaPVjc# zIQEF}vG#)uMTt5Ncb|BsszO$M3Upb+9zl1&Apar09%WXP*PKzyNGL!^k{=$m8X9R1 zf+fGdSnnfOHr~y|0|T)N1AAala8dY%Ld*nVk!M>51-?{u+s-`K07+~5HJj7ocn#?N z5HX+a|A{(>sX$67X`D0!xt36 z1NJOgw4U1DXSd3QBmSDzH%Z7iFdZLN@px-pKntj%QKdRW)lJb5l;ZVPej69kMu^54 zz5q1;=-&8QSSZ&&@Vl#R{*v)&;&9Es$0*-DYkKOak-HIGKLkDbb_r3|2P=Z@e}wT` z5!Ewnu+Zh=t@AL_G~=|ENUuBmTi!plv}CP?ngszoeu>n^w+S;sYAlRYoek~gTZs5E zdxQU3W>GvEv{2onQhEN-|2JhJH3hm^1xi!!$9Dc!lq1A16$HJ+Jy;B8_WOxfmL_BU# z0WV>$_~UlqJiow-?VW~x9Yhsa6ObS@5`wro_2#0*m!KcL3?SQ-5&N%