diff options
-rwxr-xr-x | .gitignore | 6 | ||||
-rw-r--r-- | .gitmodules | 4 | ||||
-rwxr-xr-x | Dockerfile | 7 | ||||
-rwxr-xr-x | Dockerfile_cron | 11 | ||||
-rw-r--r-- | cron_entrypoint.sh | 6 | ||||
-rwxr-xr-x | docker-compose.yml | 44 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/app.py (renamed from app.py) | 19 | ||||
-rw-r--r-- | edaweb/cache.py | 18 | ||||
-rw-r--r-- | edaweb/database.py (renamed from database.py) | 19 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/downloader.py (renamed from downloader.py) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/parser.py (renamed from parser.py) | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/services.py (renamed from services.py) | 53 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/0don0t4ofuc41-3776935852.jpg (renamed from static/images/0don0t4ofuc41-3776935852.jpg) | bin | 131290 -> 131290 bytes | |||
-rw-r--r-- | edaweb/static/images/1544552064683.jpg (renamed from static/images/1544552064683.jpg) | bin | 171824 -> 171824 bytes | |||
-rw-r--r-- | edaweb/static/images/1549844950404.jpg (renamed from static/images/1549844950404.jpg) | bin | 112071 -> 112071 bytes | |||
-rw-r--r-- | edaweb/static/images/1555824429083.png (renamed from static/images/1555824429083.png) | bin | 170252 -> 170252 bytes | |||
-rw-r--r-- | edaweb/static/images/1555824491105.png (renamed from static/images/1555824491105.png) | bin | 177365 -> 177365 bytes | |||
-rw-r--r-- | edaweb/static/images/1671540582317176.png (renamed from static/images/1671540582317176.png) | bin | 3276156 -> 3276156 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/1urouter.jpg (renamed from static/images/1urouter.jpg) | bin | 183429 -> 183429 bytes | |||
-rw-r--r-- | edaweb/static/images/20220401_222149.jpg (renamed from static/images/20220401_222149.jpg) | bin | 38897 -> 38897 bytes | |||
-rw-r--r-- | edaweb/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg (renamed from static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg) | bin | 531668 -> 531668 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg (renamed from static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg) | bin | 13920 -> 13920 bytes | |||
-rw-r--r-- | edaweb/static/images/5600x.jpg (renamed from static/images/5600x.jpg) | bin | 151209 -> 151209 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/9400t.jpg (renamed from static/images/9400t.jpg) | bin | 2603012 -> 2603012 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/9400t_cooler.jpg (renamed from static/images/9400t_cooler.jpg) | bin | 4997396 -> 4997396 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E1NlPc1X0AEkB-s.png (renamed from static/images/E1NlPc1X0AEkB-s.png) | bin | 3029 -> 3029 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E3xdm-hWYAEADNx.jpg (renamed from static/images/E3xdm-hWYAEADNx.jpg) | bin | 13609 -> 13609 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E4WhXAvWYAIFwEa.png (renamed from static/images/E4WhXAvWYAIFwEa.png) | bin | 10560 -> 10560 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E4cjVaPXEAU83U0.png (renamed from static/images/E4cjVaPXEAU83U0.png) | bin | 15418 -> 15418 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E7ODIBeX0AAivRV.jpg (renamed from static/images/E7ODIBeX0AAivRV.jpg) | bin | 75338 -> 75338 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E7ODIZEWUAMQjty.jpg (renamed from static/images/E7ODIZEWUAMQjty.jpg) | bin | 94889 -> 94889 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E7ODIv0WUAUp-ad.jpg (renamed from static/images/E7ODIv0WUAUp-ad.jpg) | bin | 88028 -> 88028 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/E7ODJELX0AAVqna.jpg (renamed from static/images/E7ODJELX0AAVqna.jpg) | bin | 107275 -> 107275 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/EbmVCYKWkAAwXKW.jpg (renamed from static/images/EbmVCYKWkAAwXKW.jpg) | bin | 34657 -> 34657 bytes | |||
-rw-r--r-- | edaweb/static/images/Ffi1ducXEAArXDg.jpg | bin | 0 -> 18055 bytes | |||
-rw-r--r-- | edaweb/static/images/GGBDzuSXMAA1Ktk.jpg (renamed from static/images/GGBDzuSXMAA1Ktk.jpg) | bin | 65355 -> 65355 bytes | |||
-rw-r--r-- | edaweb/static/images/GSxGe_rXQAAgEhj.jpg (renamed from static/images/GSxGe_rXQAAgEhj.jpg) | bin | 1443057 -> 1443057 bytes | |||
-rw-r--r-- | edaweb/static/images/GTq-GOgWQAErvCp.jpg (renamed from static/images/GTq-GOgWQAErvCp.jpg) | bin | 376374 -> 376374 bytes | |||
-rwxr-xr-x | edaweb/static/images/GZhgzaK.png | bin | 0 -> 124272 bytes | |||
-rw-r--r-- | edaweb/static/images/GcyexeCW0AAYssz.jpg (renamed from static/images/GcyexeCW0AAYssz.jpg) | bin | 992976 -> 992976 bytes | |||
-rwxr-xr-x | edaweb/static/images/GegzRla.png | bin | 0 -> 44635 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_-g4wqat.jpg (renamed from static/images/IMG_-g4wqat.jpg) | bin | 82371 -> 82371 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1602.jpg (renamed from static/images/IMG_1602.jpg) | bin | 24762 -> 24762 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1603.jpg (renamed from static/images/IMG_1603.jpg) | bin | 26478 -> 26478 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1604.jpg (renamed from static/images/IMG_1604.jpg) | bin | 35792 -> 35792 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1605.jpg (renamed from static/images/IMG_1605.jpg) | bin | 33782 -> 33782 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1606.jpg (renamed from static/images/IMG_1606.jpg) | bin | 34771 -> 34771 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1607.jpg (renamed from static/images/IMG_1607.jpg) | bin | 39764 -> 39764 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1609.jpg (renamed from static/images/IMG_1609.jpg) | bin | 48287 -> 48287 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1610.jpg (renamed from static/images/IMG_1610.jpg) | bin | 41368 -> 41368 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1611.jpg (renamed from static/images/IMG_1611.jpg) | bin | 24732 -> 24732 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1612.jpg (renamed from static/images/IMG_1612.jpg) | bin | 26570 -> 26570 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1613.png (renamed from static/images/IMG_1613.png) | bin | 2339298 -> 2339298 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1614.png (renamed from static/images/IMG_1614.png) | bin | 317510 -> 317510 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1615.jpg (renamed from static/images/IMG_1615.jpg) | bin | 27792 -> 27792 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1616.jpg (renamed from static/images/IMG_1616.jpg) | bin | 43497 -> 43497 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1617.jpg (renamed from static/images/IMG_1617.jpg) | bin | 11756 -> 11756 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1618.jpg (renamed from static/images/IMG_1618.jpg) | bin | 21924 -> 21924 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1619.jpg (renamed from static/images/IMG_1619.jpg) | bin | 10839 -> 10839 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1620.jpg (renamed from static/images/IMG_1620.jpg) | bin | 25630 -> 25630 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1621.jpg (renamed from static/images/IMG_1621.jpg) | bin | 246181 -> 246181 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1622.jpg (renamed from static/images/IMG_1622.jpg) | bin | 163205 -> 163205 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1623.jpg (renamed from static/images/IMG_1623.jpg) | bin | 65738 -> 65738 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1624.png (renamed from static/images/IMG_1624.png) | bin | 337723 -> 337723 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1625.jpg (renamed from static/images/IMG_1625.jpg) | bin | 31273 -> 31273 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1626.jpg (renamed from static/images/IMG_1626.jpg) | bin | 28916 -> 28916 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1627.jpg (renamed from static/images/IMG_1627.jpg) | bin | 33325 -> 33325 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1628.jpg (renamed from static/images/IMG_1628.jpg) | bin | 21475 -> 21475 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1629.jpg (renamed from static/images/IMG_1629.jpg) | bin | 13153 -> 13153 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1630.jpg (renamed from static/images/IMG_1630.jpg) | bin | 33638 -> 33638 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1632.jpg (renamed from static/images/IMG_1632.jpg) | bin | 52252 -> 52252 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1633.jpg (renamed from static/images/IMG_1633.jpg) | bin | 32028 -> 32028 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1636.jpg (renamed from static/images/IMG_1636.jpg) | bin | 45916 -> 45916 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1637.jpg (renamed from static/images/IMG_1637.jpg) | bin | 13999 -> 13999 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1638.jpg (renamed from static/images/IMG_1638.jpg) | bin | 79337 -> 79337 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1639.jpg (renamed from static/images/IMG_1639.jpg) | bin | 130710 -> 130710 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1640.jpg (renamed from static/images/IMG_1640.jpg) | bin | 77986 -> 77986 bytes | |||
-rw-r--r-- | edaweb/static/images/IMG_1641.jpg (renamed from static/images/IMG_1641.jpg) | bin | 41247 -> 41247 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20210422_212009.jpg (renamed from static/images/IMG_20210422_212009.jpg) | bin | 2976182 -> 2976182 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20210824_175000.jpg (renamed from static/images/IMG_20210824_175000.jpg) | bin | 3292970 -> 3292970 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20220809_172130442_HDR.jpg (renamed from static/images/IMG_20220809_172130442_HDR.jpg) | bin | 2715100 -> 2715100 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20220811_133224877_HDR.jpg (renamed from static/images/IMG_20220811_133224877_HDR.jpg) | bin | 3336994 -> 3336994 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20220811_133224877_HDR_crop.jpg (renamed from static/images/IMG_20220811_133224877_HDR_crop.jpg) | bin | 2168764 -> 2168764 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20220812_112838125_HDR.jpg (renamed from static/images/IMG_20220812_112838125_HDR.jpg) | bin | 3440299 -> 3440299 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20220823_154457137_HDR.jpg (renamed from static/images/IMG_20220823_154457137_HDR.jpg) | bin | 3971263 -> 3971263 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20221023_163821542.jpg (renamed from static/images/IMG_20221023_163821542.jpg) | bin | 1461946 -> 1461946 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20230812_132400733_HDR.jpg (renamed from static/images/IMG_20230812_132400733_HDR.jpg) | bin | 3044563 -> 3044563 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/IMG_20230812_132632784_HDR.jpg (renamed from static/images/IMG_20230812_132632784_HDR.jpg) | bin | 3452950 -> 3452950 bytes | |||
-rwxr-xr-x | edaweb/static/images/JwL2S2V.png | bin | 0 -> 120751 bytes | |||
-rw-r--r-- | edaweb/static/images/PXL_20250314_150055804.jpg | bin | 0 -> 1835356 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210520-221830.png (renamed from static/images/Screenshot_20210520-221830.png) | bin | 275641 -> 275641 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210527_122432.png (renamed from static/images/Screenshot_20210527_122432.png) | bin | 1683456 -> 1683456 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210620-144127.png (renamed from static/images/Screenshot_20210620-144127.png) | bin | 142673 -> 142673 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210620-231652.png (renamed from static/images/Screenshot_20210620-231652.png) | bin | 133513 -> 133513 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210727-072303.png (renamed from static/images/Screenshot_20210727-072303.png) | bin | 138225 -> 138225 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210727-072344.png (renamed from static/images/Screenshot_20210727-072344.png) | bin | 129039 -> 129039 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210727-223004.png (renamed from static/images/Screenshot_20210727-223004.png) | bin | 136574 -> 136574 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210731-181223.png (renamed from static/images/Screenshot_20210731-181223.png) | bin | 359217 -> 359217 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210731-181229.png (renamed from static/images/Screenshot_20210731-181229.png) | bin | 152242 -> 152242 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210811-125853.png (renamed from static/images/Screenshot_20210811-125853.png) | bin | 129411 -> 129411 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210818-203828.png (renamed from static/images/Screenshot_20210818-203828.png) | bin | 112321 -> 112321 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/Screenshot_20210825-131938.png (renamed from static/images/Screenshot_20210825-131938.png) | bin | 120763 -> 120763 bytes | |||
-rw-r--r-- | edaweb/static/images/Startech.jpg (renamed from static/images/Startech.jpg) | bin | 456042 -> 456042 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/a4-5000.jpg (renamed from static/images/a4-5000.jpg) | bin | 6252 -> 6252 bytes | |||
-rwxr-xr-x | edaweb/static/images/aLvcFjj.png | bin | 0 -> 23224 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/aaaaahh.jpg (renamed from static/images/aaaaahh.jpg) | bin | 52325 -> 52325 bytes | |||
-rw-r--r-- | edaweb/static/images/anti_nft_b.png (renamed from static/images/anti_nft_b.png) | bin | 2311 -> 2311 bytes | |||
-rw-r--r-- | edaweb/static/images/arenas.jpg (renamed from static/images/arenas.jpg) | bin | 294229 -> 294229 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/basil.jpg (renamed from static/images/basil.jpg) | bin | 6068 -> 6068 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/bigshark.png (renamed from static/images/bigshark.png) | bin | 2355827 -> 2355827 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/bob.gif (renamed from static/images/bob.gif) | bin | 142993 -> 142993 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/braindamage.png (renamed from static/images/braindamage.png) | bin | 22441 -> 22441 bytes | |||
-rw-r--r-- | edaweb/static/images/catonlap.jpg (renamed from static/images/catonlap.jpg) | bin | 68382 -> 68382 bytes | |||
-rw-r--r-- | edaweb/static/images/chuddy.jpg (renamed from static/images/chuddy.jpg) | bin | 78447 -> 78447 bytes | |||
-rw-r--r-- | edaweb/static/images/cloudfree.png | bin | 0 -> 3080 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/embedded_img2.png (renamed from static/images/embedded_img2.png) | bin | 8613 -> 8613 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/embedded_img3.png (renamed from static/images/embedded_img3.png) | bin | 18291 -> 18291 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/embedded_img4.png (renamed from static/images/embedded_img4.png) | bin | 16801 -> 16801 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/embedded_img5.PNG (renamed from static/images/embedded_img5.PNG) | bin | 11374 -> 11374 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/face.jpg (renamed from static/images/face.jpg) | bin | 226207 -> 226207 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/first_server.jpg (renamed from static/images/first_server.jpg) | bin | 2700813 -> 2700813 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/fstab.png (renamed from static/images/fstab.png) | bin | 88618 -> 88618 bytes | |||
-rw-r--r-- | edaweb/static/images/graduation.jpg (renamed from static/images/graduation.jpg) | bin | 290228 -> 290228 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/greenboi.jpg (renamed from static/images/greenboi.jpg) | bin | 17079 -> 17079 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/hpkvm_puttyconf.png (renamed from static/images/hpkvm_puttyconf.png) | bin | 17830 -> 17830 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/hpkvm_serialconf.png (renamed from static/images/hpkvm_serialconf.png) | bin | 13801 -> 13801 bytes | |||
-rw-r--r-- | edaweb/static/images/i5-1145G7.png (renamed from static/images/i5-1145G7.png) | bin | 118559 -> 118559 bytes | |||
-rwxr-xr-x | edaweb/static/images/iKVCEoy.png | bin | 0 -> 97879 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/icons.png (renamed from static/images/icons.png) | bin | 46132 -> 46132 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/ioporn.jpg (renamed from static/images/ioporn.jpg) | bin | 51451 -> 51451 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/its_true_1.jpg (renamed from static/images/its_true_1.jpg) | bin | 71857 -> 71857 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/its_true_2.jpg (renamed from static/images/its_true_2.jpg) | bin | 109263 -> 109263 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/j1800.jpg (renamed from static/images/j1800.jpg) | bin | 1589479 -> 1589479 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/j5040.jpg (renamed from static/images/j5040.jpg) | bin | 3220569 -> 3220569 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/j5040_server.jpg (renamed from static/images/j5040_server.jpg) | bin | 2767061 -> 2767061 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/kvm_1.png (renamed from static/images/kvm_1.png) | bin | 60072 -> 60072 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/kvm_2.png (renamed from static/images/kvm_2.png) | bin | 150115 -> 150115 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/lackrack1.jpg (renamed from static/images/lackrack1.jpg) | bin | 335971 -> 335971 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/lackrack2.jpg (renamed from static/images/lackrack2.jpg) | bin | 381379 -> 381379 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/libreboot.jpg (renamed from static/images/libreboot.jpg) | bin | 1910228 -> 1910228 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/liostore.png (renamed from static/images/liostore.png) | bin | 691184 -> 691184 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/media_E9lTIldWUAEeT63.jpg (renamed from static/images/media_E9lTIldWUAEeT63.jpg) | bin | 180897 -> 180897 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/media_FPus_2aXsAUhCu9.jpg (renamed from static/images/media_FPus_2aXsAUhCu9.jpg) | bin | 480286 -> 480286 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/media_FRlRqYKXoAIw82O.jpg (renamed from static/images/media_FRlRqYKXoAIw82O.jpg) | bin | 55076 -> 55076 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/media_FeP_m8FXEAAqcJs.jpg (renamed from static/images/media_FeP_m8FXEAAqcJs.jpg) | bin | 279374 -> 279374 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/media_FfcNNZ2WYAAz97v.jpg (renamed from static/images/media_FfcNNZ2WYAAz97v.jpg) | bin | 377136 -> 377136 bytes | |||
-rw-r--r-- | edaweb/static/images/media_FlBsMq2XwAATJX5.jpg (renamed from static/images/media_FlBsMq2XwAATJX5.jpg) | bin | 885129 -> 885129 bytes | |||
-rw-r--r-- | edaweb/static/images/media_FlBsfDcWQAQhJdP.jpg (renamed from static/images/media_FlBsfDcWQAQhJdP.jpg) | bin | 660235 -> 660235 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/minecraft.png (renamed from static/images/minecraft.png) | bin | 27516 -> 27516 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/new_switch_opened.jpg (renamed from static/images/new_switch_opened.jpg) | bin | 4348235 -> 4348235 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/newdiscord.jpg (renamed from static/images/newdiscord.jpg) | bin | 56309 -> 56309 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/nicfan.jpg (renamed from static/images/nicfan.jpg) | bin | 2593649 -> 2593649 bytes | |||
-rw-r--r-- | edaweb/static/images/notstolenvalour4.png (renamed from static/images/notstolenvalour4.png) | bin | 1752598 -> 1752598 bytes | |||
-rw-r--r-- | edaweb/static/images/notstolenvalour5.png (renamed from static/images/notstolenvalour5.png) | bin | 1703482 -> 1703482 bytes | |||
-rw-r--r-- | edaweb/static/images/notstolenvalour8.png | bin | 0 -> 1706779 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/oldpic.png (renamed from static/images/oldpic.png) | bin | 938082 -> 938082 bytes | |||
-rw-r--r-- | edaweb/static/images/pfsenseswissvpnportforwards.png (renamed from static/images/pfsenseswissvpnportforwards.png) | bin | 118254 -> 118254 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/photo_2022-12-07_14-06-03.jpg (renamed from static/images/photo_2022-12-07_14-06-03.jpg) | bin | 12097 -> 12097 bytes | |||
-rw-r--r-- | edaweb/static/images/photo_5857106224099739202_y.jpg (renamed from static/images/photo_5857106224099739202_y.jpg) | bin | 124721 -> 124721 bytes | |||
-rw-r--r-- | edaweb/static/images/powerani.gif (renamed from static/images/powerani.gif) | bin | 7203 -> 7203 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg (renamed from static/images/profile_images_1598652418580963328_ENk7xKDw.jpg) | bin | 42497 -> 42497 bytes | |||
-rwxr-xr-x | edaweb/static/images/rOJXmjG.png | bin | 0 -> 101799 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/rack1.jpg (renamed from static/images/rack1.jpg) | bin | 210052 -> 210052 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/rack2.jpg (renamed from static/images/rack2.jpg) | bin | 190057 -> 190057 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/router.jpg (renamed from static/images/router.jpg) | bin | 694385 -> 694385 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/russian_isp.png (renamed from static/images/russian_isp.png) | bin | 52664 -> 52664 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/russian_isp_abuse.png (renamed from static/images/russian_isp_abuse.png) | bin | 52880 -> 52880 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/russian_nginx_logs.jpg (renamed from static/images/russian_nginx_logs.jpg) | bin | 224155 -> 224155 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/russian_yt.jpg (renamed from static/images/russian_yt.jpg) | bin | 130618 -> 130618 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/s-l1600.jpg (renamed from static/images/s-l1600.jpg) | bin | 152914 -> 152914 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/s-l16001.jpg (renamed from static/images/s-l16001.jpg) | bin | 226604 -> 226604 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/s-l500.jpg (renamed from static/images/s-l500.jpg) | bin | 31862 -> 31862 bytes | |||
-rw-r--r-- | edaweb/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg (renamed from static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg) | bin | 185850 -> 185850 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/selfie.jpg (renamed from static/images/selfie.jpg) | bin | 73451 -> 73451 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/server.jpg (renamed from static/images/server.jpg) | bin | 2578909 -> 2578909 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/server2.jpg (renamed from static/images/server2.jpg) | bin | 2877532 -> 2877532 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/shark1.jpg (renamed from static/images/shark1.jpg) | bin | 449065 -> 449065 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/shark2.jpg (renamed from static/images/shark2.jpg) | bin | 433903 -> 433903 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/shark3.jpg (renamed from static/images/shark3.jpg) | bin | 518122 -> 518122 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/shark3.png (renamed from static/images/shark3.png) | bin | 2944760 -> 2944760 bytes | |||
-rw-r--r-- | edaweb/static/images/shun-hashimoto-mio-chibana.gif | bin | 0 -> 1472535 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/sicp.jpg (renamed from static/images/sicp.jpg) | bin | 3664911 -> 3664911 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/startech_rack_1.jpg (renamed from static/images/startech_rack_1.jpg) | bin | 3083071 -> 3083071 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/startech_rack_2.jpg (renamed from static/images/startech_rack_2.jpg) | bin | 2093105 -> 2093105 bytes | |||
-rw-r--r-- | edaweb/static/images/stolenvalour.jpg (renamed from static/images/stolenvalour.jpg) | bin | 234621 -> 234621 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/sun.gif (renamed from static/images/sun.gif) | bin | 3097 -> 3097 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/switch.jpg (renamed from static/images/switch.jpg) | bin | 90618 -> 90618 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/switches.jpg (renamed from static/images/switches.jpg) | bin | 3169089 -> 3169089 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/t30.jpg (renamed from static/images/t30.jpg) | bin | 235413 -> 235413 bytes | |||
-rw-r--r-- | edaweb/static/images/techdome.jpg (renamed from static/images/techdome.jpg) | bin | 125311 -> 125311 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/telegrampic.jpg (renamed from static/images/telegrampic.jpg) | bin | 138371 -> 138371 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/telegrampic2.jpg (renamed from static/images/telegrampic2.jpg) | bin | 25752 -> 25752 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/testimonials.PNG (renamed from static/images/testimonials.PNG) | bin | 190391 -> 190391 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/theNVMEVault.png (renamed from static/images/theNVMEVault.png) | bin | 51977 -> 51977 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/twitterpic.jpg (renamed from static/images/twitterpic.jpg) | bin | 14667 -> 14667 bytes | |||
-rwxr-xr-x | edaweb/static/images/v2Yfoou.jpg | bin | 0 -> 165128 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/vcss-blue.gif (renamed from static/images/vcss-blue.gif) | bin | 1759 -> 1759 bytes | |||
-rw-r--r-- | edaweb/static/images/www.gif (renamed from static/images/www.gif) | bin | 1531 -> 1531 bytes | |||
-rwxr-xr-x | edaweb/static/images/wxbKYVv.png | bin | 0 -> 123728 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/x200.jpg (renamed from static/images/x200.jpg) | bin | 2732895 -> 2732895 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/xeon.jpg (renamed from static/images/xeon.jpg) | bin | 571574 -> 571574 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/images/xeon_motherboard.jpg (renamed from static/images/xeon_motherboard.jpg) | bin | 757343 -> 757343 bytes | |||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/index.md (renamed from static/index.md) | 9 | ||||
-rw-r--r-- | edaweb/static/papers/aai.pdf | bin | 0 -> 311217 bytes | |||
-rw-r--r-- | edaweb/static/papers/ar2.pdf | bin | 0 -> 289686 bytes | |||
-rw-r--r-- | edaweb/static/robots.txt | 7 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/static/style.css (renamed from static/style.css) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/diary.html.j2 (renamed from templates/diary.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/discord.html.j2 (renamed from templates/discord.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/index.html.j2 (renamed from templates/index.html.j2) | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/isocd.html.j2 (renamed from templates/isocd.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/isocd_confirmation.html.j2 (renamed from templates/isocd_confirmation.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/nhdl.html.j2 (renamed from templates/nhdl.html.j2) | 0 | ||||
-rw-r--r-- | edaweb/templates/questions.html.j2 (renamed from templates/questions.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/random.html.j2 (renamed from templates/random.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/services.html.j2 (renamed from templates/services.html.j2) | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/template.html.j2 (renamed from templates/template.html.j2) | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/thought.html.j2 (renamed from templates/thought.html.j2) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | edaweb/templates/thoughts.html.j2 (renamed from templates/thoughts.html.j2) | 0 | ||||
-rw-r--r-- | entrypoint.sh | 5 | ||||
-rw-r--r-- | homelab-wiki/Dockerfile | 2 | ||||
-rw-r--r-- | homelab-wiki/LocalSettings.php | 15 | ||||
m--------- | nitter/nitter | 0 | ||||
-rwxr-xr-x | requirements.txt | 7 | ||||
-rwxr-xr-x | scripts/export.sh | 2 | ||||
-rwxr-xr-x | scripts/update.sh | 2 | ||||
-rwxr-xr-x | static/robots.txt | 2 |
227 files changed, 174 insertions, 80 deletions
@@ -2,10 +2,10 @@ *.pub homelab-wiki/wiki.env homelab-wiki/images/* -edaweb.conf +*edaweb.conf markdowns/ -static/images/random.jpg -static/zips/*.zip +*random.jpg +*.zip .nfs* static/images/Thumbs.db nitter/nitter.conf diff --git a/.gitmodules b/.gitmodules index 1b086ba..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "nitter/nitter"] - path = nitter/nitter - url = git@github.com:zedeus/nitter.git - branch = guest_accounts @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:jammy-20250404 MAINTAINER Eden Attenborough "eden.attenborough@outlook.com" ENV TZ=Europe/London RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -7,5 +7,6 @@ RUN apt-get install -y python3-pip python3-dev build-essential clang libffi-dev COPY . /app WORKDIR /app RUN pip3 install -r requirements.txt -ENTRYPOINT ["python3"] -CMD ["app.py", "--production"] + +ENTRYPOINT ["bash"] +CMD ["entrypoint.sh"] diff --git a/Dockerfile_cron b/Dockerfile_cron new file mode 100755 index 0000000..dea3208 --- /dev/null +++ b/Dockerfile_cron @@ -0,0 +1,11 @@ +FROM reg.reaweb.uk/edaweb +MAINTAINER Eden Attenborough "eden.attenborough@outlook.com" +ENV TZ=Europe/London +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +RUN apt-get update -y +RUN apt-get install -y tmux cron + +RUN echo "*/30 * * * * root python3 /app/edaweb/cache.py > /proc/1/fd/1 2>/proc/1/fd/2" > /etc/crontab + +ENTRYPOINT ["bash"] +CMD ["cron_entrypoint.sh"] diff --git a/cron_entrypoint.sh b/cron_entrypoint.sh new file mode 100644 index 0000000..2d98169 --- /dev/null +++ b/cron_entrypoint.sh @@ -0,0 +1,6 @@ +rm -rvf /app/edaweb/edaweb.conf/ +ln -s /app/edaweb.conf /app/edaweb/edaweb.conf +printenv | grep -v "no_proxy" >> /etc/environment +# tmux new-session -d -s "cron" 'cron -f || bash && bash'; +cron -f + diff --git a/docker-compose.yml b/docker-compose.yml index 47c5d5f..01bf365 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: edaweb: build: @@ -7,13 +6,34 @@ services: image: reg.reaweb.uk/edaweb volumes: - /tmp/:/media/ISOs/ - - ./static/:/app/static/ + - ./edaweb/static/:/app/edaweb/static/ - ./edaweb.conf:/app/edaweb.conf + - edaweb-tmp:/tmp/ ports: - "6969:6969" + external_links: + - mariadb:mysql + - transmission_1:transmission + mac_address: 44:c8:09:a7:d0:93 + networks: + db-network: + rr-net: + ipv4_address: "192.168.23.13" + restart: unless-stopped + + edaweb_cron: + build: + context: . + dockerfile: Dockerfile_cron + image: reg.reaweb.uk/edaweb_cron + volumes: + - /tmp/:/media/ISOs/ + - ./edaweb/static/:/app/edaweb/static/ + - ./edaweb.conf:/app/edaweb.conf + - ./edaweb-docker.pem:/keys/docker-key.pem + - edaweb-tmp:/tmp/ networks: - db-network - - edaweb-net external_links: - mariadb:mysql restart: unless-stopped @@ -32,19 +52,19 @@ services: - "6970:80" networks: - db-network - - edaweb-net external_links: - mariadb:mysql restart: unless-stopped -networks: - edaweb-net: - external: - name: edaweb-net +volumes: + edaweb-tmp: +networks: db-network: - external: - name: mariadb + external: true + name: mariadb + + rr-net: + external: true + name: rr-net -volumes: - nitter-redis: diff --git a/app.py b/edaweb/app.py index 985bcac..436df7a 100755..100644 --- a/app.py +++ b/edaweb/app.py @@ -17,7 +17,7 @@ import io app = flask.Flask(__name__) CONFIG = configparser.ConfigParser(interpolation = None) -CONFIG.read("edaweb.conf") +CONFIG.read(os.path.join(os.path.dirname(__file__), "edaweb.conf")) shown_images = set() shown_sidebar_images = set() @@ -64,13 +64,14 @@ def get_template_items(title, db): @app.route("/~") def index(): with database.Database() as db: - with open(os.path.join("static", "index.md"), "r") as f: + with open(os.path.join(os.path.dirname(__file__), "static", "index.md"), "r") as f: return flask.render_template( "index.html.j2", **get_template_items("eden's site :3", db), + days_till_ffs = datetime.datetime(2025, 11, 8) - datetime.datetime.now(), markdown = parser.parse_text(f.read())[0], featured_thoughts = db.get_featured_thoughts(), - commits = db.get_cached_commits()[:10], + commits = services.get_recent_commits(db)[:15], sidebar_img = get_sidebar_img(db) ) @@ -84,7 +85,7 @@ def serve_services(): return flask.render_template( "services.html.j2", **get_template_items("services", db), - docker = services.get_all_docker_containers(CONFIG.get("ssh", "docker_key_path")), + docker = services.get_all_docker_containers(), trans = services.get_torrent_stats(), pihole = services.get_pihole_stats() ) @@ -142,7 +143,7 @@ def get_thoughts(): @app.route("/img/<filename>") def serve_image(filename): - imdirpath = os.path.join(".", "static", "images") + imdirpath = os.path.join(os.path.dirname(__file__), "static", "images") if filename in os.listdir(imdirpath): try: w = int(flask.request.args['w']) @@ -184,7 +185,11 @@ def serve_iso_form(): @app.route("/zip/<zipfile>") def serve_zip(zipfile): - return flask.send_from_directory(os.path.join(".", "static", "zips"), zipfile) + return flask.send_from_directory(os.path.join(os.path.dirname(__file__), "static", "zips"), zipfile) + +@app.route("/pdf/<pdfname>") +def serve_pdf(pdfname): + return flask.send_from_directory(os.path.join(os.path.dirname(__file__), "static", "papers"), pdfname) @app.route("/nhdlredirect", methods = ["POST"]) def redirect_nhdl(): @@ -219,7 +224,7 @@ def serve_random(): sbi = services.get_random_image(tags) req = urllib.request.Request(sbi.imurl) mediaContent = urllib.request.urlopen(req).read() - with open(os.path.join("static", "images", "random.jpg"), "wb") as f: + with open(os.path.join(os.path.dirname(__file__), "static", "images", "random.jpg"), "wb") as f: f.write(mediaContent) with database.Database() as db: diff --git a/edaweb/cache.py b/edaweb/cache.py new file mode 100644 index 0000000..5b66e43 --- /dev/null +++ b/edaweb/cache.py @@ -0,0 +1,18 @@ +import database +import services + +def update_cache(): + print("Updating cache...") + with database.Database() as db: + db.update_commit_cache(services.request_recent_commits(since = db.get_last_commit_time())) + print("Finished adding github commits...") + db.append_qnas(services.scrape_whispa(db.config.get("qnas", "url"), since = db.get_oldest_qna())) + print("Finished parsing Q&As...") + + print("Started getting docker information with SSH...") + print(services.cache_all_docker_containers(services.CONFIG.get("ssh", "docker_key_path"))) + print("Finished caching.") + + +if __name__ == "__main__": + update_cache()
\ No newline at end of file diff --git a/database.py b/edaweb/database.py index cd15cec..49ec33c 100644 --- a/database.py +++ b/edaweb/database.py @@ -21,7 +21,7 @@ class Database: def __enter__(self): self.config = configparser.ConfigParser(interpolation = None) - self.config.read("edaweb.conf") + self.config.read(os.path.join(os.path.dirname(__file__), "edaweb.conf")) if self.safeLogin: self.__connection = pymysql.connect( @@ -44,7 +44,7 @@ class Database: def get_header_links(self): with self.__connection.cursor() as cursor: - cursor.execute("SELECT name, link FROM headerLinks ORDER BY name;") + cursor.execute("SELECT name, link FROM headerLinks WHERE display = true ORDER BY name;") return cursor.fetchall() def get_image(self, imageName): @@ -64,7 +64,7 @@ class Database: def get_header_articles(self): with self.__connection.cursor() as cursor: - cursor.execute("SELECT articleName, link FROM headerArticles;") + cursor.execute("SELECT articleName, link FROM headerArticles WHERE display = true;") return cursor.fetchall() def get_all_categories(self): @@ -146,7 +146,6 @@ class Database: return [(i[0], "https://%s/%s/status/%d" % (self.config.get("nitter", "outsideurl"), i[2], i[1])) for i in cursor.fetchall()] def get_cached_commits(self, since = None, recurse = True): - threading.Thread(target = update_cache).start() with self.__connection.cursor() as cursor: if since is not None: cursor.execute("SELECT DISTINCT message, url, commitTime, additions, deletions, total FROM commitCache WHERE commitTime > %s ORDER BY commitTime DESC;", (since, )) @@ -164,7 +163,7 @@ class Database: urlparse(i[1]).path.split("/")[2], urlparse(i[1]).path.split("/")[-1] ), - "datetime": i[2], + "datetime": i[2].timestamp(), "stats": { "additions": i[3], "deletions": i[4], @@ -243,17 +242,7 @@ class Database: cursor.execute("SELECT * FROM qnas;") return sorted(cursor.fetchall(), key = operator.itemgetter(2), reverse = True) -def update_cache(): - print("Updating cache...") - with Database() as db: - db.update_commit_cache(services.request_recent_commits(since = db.get_last_commit_time())) - print("Finished adding github commits...") - db.append_qnas(services.scrape_whispa(db.config.get("qnas", "url"), since = db.get_oldest_qna())) - print("Finished parsing Q&As...") - -if __name__ == "__main__": - update_cache() diff --git a/downloader.py b/edaweb/downloader.py index 4b2af2f..4b2af2f 100755..100644 --- a/downloader.py +++ b/edaweb/downloader.py diff --git a/parser.py b/edaweb/parser.py index a851846..00daf3b 100755..100644 --- a/parser.py +++ b/edaweb/parser.py @@ -49,6 +49,14 @@ class EdawebRenderer(mistune.HTMLRenderer): return "<h%d id='%s'>%s <a class='header_linker' href='#%s'>[#]</a></h%d>" % ( level, hash_, text, hash_, level ) + + # it would appear that the escape=False option does not work with custom renderers, + # so we set it to True and just have these silly function stubs to include them manually + def inline_html(self, html): + return html + + def block_html(self, html): + return html def get_thought_from_id(db, id_): category_name, title, dt, markdown, redirect = db.get_thought(id_) @@ -64,7 +72,8 @@ def parse_file(path): def parse_text(unformatted): md = mistune.create_markdown( renderer = EdawebRenderer(), - plugins = ["strikethrough", "table", "url", "task_lists", "def_list"] + plugins = ["strikethrough", "table", "url", "task_lists", "def_list"], + # escape = False ) html = md(unformatted) if html == "": diff --git a/services.py b/edaweb/services.py index 5fb7d81..5506ef1 100755..100644 --- a/services.py +++ b/edaweb/services.py @@ -15,6 +15,7 @@ import docker import random import subprocess import fabric +import pickle import queue import json import time @@ -22,7 +23,7 @@ import os theLastId = 0 CONFIG = configparser.ConfigParser(interpolation = None) -CONFIG.read("edaweb.conf") +CONFIG.read(os.path.join(os.path.dirname(__file__), "edaweb.conf")) def humanbytes(B): 'Return the given bytes as a human friendly KB, MB, GB, or TB string' @@ -246,7 +247,7 @@ def parse_tweet(tweet_url): return dt, replying_to, text, images -def scrape_whispa(whispa_url, since): +def scrape_whispa(whispa_url, since = None): tree = html.fromstring(requests.get(whispa_url).content.decode()) qnas = [] # we're not doing proper HTML scraping here really... since the site uses client side rendering @@ -256,6 +257,9 @@ def scrape_whispa(whispa_url, since): if "receivedFeedback" in js: # my god this is horrible... for j in json.loads(json.loads(js[19:-1])[1][2:])[0][3]["loadedUser"]["receivedFeedback"]: + if j["childFeedback"] == []: + continue + dt = datetime.datetime.fromisoformat(j["childFeedback"][0]["createdAt"][:-1]) qnas.append({ @@ -280,12 +284,23 @@ def get_docker_containers(host, ssh_key_path): ).run('docker ps -a -s --format "table {{.Names}};{{.Status}};{{.Image}}"', hide = True) return [line.split(";") for line in result.stdout.split("\n")[1:-1]] -def get_all_docker_containers(ssh_key_path): +def cache_all_docker_containers(ssh_key_path): containers = {} + containers["containers"] = {} for host, name in CONFIG["docker_hosts"].items(): print(host) - containers[(host, name)] = get_docker_containers(host, ssh_key_path) - return containers + containers["containers"][(host, name)] = get_docker_containers(host, ssh_key_path) + + containers["cachetime"] = "Docker information last updated at %s" % str(datetime.datetime.now()) + with open("/tmp/docker-cache.json", "wb") as f: + pickle.dump(containers, f) + +def get_all_docker_containers(): + if not os.path.exists("/tmp/docker-cache.json"): + return {"containers": {}, "cachetime": "No cached docker information"} + + with open("/tmp/docker-cache.json", "rb") as f: + return pickle.load(f) def timeout(func): # cant get this to work with queue.Queue() for some reason? @@ -324,7 +339,7 @@ def get_torrent_stats(): "Uploaded:": humanbytes(s["cumulative-stats"]["uploadedBytes"]), "Active time:": str(datetime.timedelta(seconds = s["cumulative-stats"]["secondsActive"])), "Files added:": s["cumulative-stats"]["filesAdded"], - "Current upload speed": humanbytes(s["uploadSpeed"]) + "s/S", + "Current upload speed:": humanbytes(s["uploadSpeed"]) + "s/S", "Current download speed:": humanbytes(s["downloadSpeed"]) + "s/S" } @@ -332,17 +347,23 @@ def get_torrent_stats(): def get_pihole_stats(): return PiHole.GetSummary(CONFIG.get("pihole", "url"), CONFIG.get("pihole", "key"), True) -if __name__ == "__main__": - # print(get_trans_stats()) - - #print(scrape_nitter(CONFIG.get("twitter", "diary_account"), 1697430888617840909)) - # print(scrape_nitter("estrogenizedboy", 1698107440489734640)) +def get_recent_commits(db, max_per_repo = 3): + cache = db.get_cached_commits() + num_per_repo = {} + out = [] + for commit in cache: + if commit["repo"] not in num_per_repo.keys(): + num_per_repo[commit["repo"]] = 0 - # print(parse_tweet("https://nitter.net/HONMISGENDERER/status/1694231618443981161#m")) + num_per_repo[commit["repo"]] += 1 + if num_per_repo[commit["repo"]] <= max_per_repo: + out.append(commit) - # print(request_recent_commits(since = datetime.datetime.now() - datetime.timedelta(days=30))) + return sorted(out, key = lambda a: a["datetime"], reverse = True) - # print(scrape_whispa(CONFIG.get("qnas", "url"), datetime.datetime.fromtimestamp(0.0))) - # print(get_all_docker_containers(os.path.join(os.path.dirname(__file__), "edaweb-docker.pem"))) +if __name__ == "__main__": + print(scrape_whispa(CONFIG.get("qnas", "url"))) + # import database - print(get_torrent_stats()) + # with database.Database() as db: + # print(json.dumps(get_recent_commits(db), indent=4)) diff --git a/static/images/0don0t4ofuc41-3776935852.jpg b/edaweb/static/images/0don0t4ofuc41-3776935852.jpg Binary files differindex f65e951..f65e951 100755..100644 --- a/static/images/0don0t4ofuc41-3776935852.jpg +++ b/edaweb/static/images/0don0t4ofuc41-3776935852.jpg diff --git a/static/images/1544552064683.jpg b/edaweb/static/images/1544552064683.jpg Binary files differindex 20a6527..20a6527 100644 --- a/static/images/1544552064683.jpg +++ b/edaweb/static/images/1544552064683.jpg diff --git a/static/images/1549844950404.jpg b/edaweb/static/images/1549844950404.jpg Binary files differindex 5197c11..5197c11 100644 --- a/static/images/1549844950404.jpg +++ b/edaweb/static/images/1549844950404.jpg diff --git a/static/images/1555824429083.png b/edaweb/static/images/1555824429083.png Binary files differindex 5b2fd0b..5b2fd0b 100644 --- a/static/images/1555824429083.png +++ b/edaweb/static/images/1555824429083.png diff --git a/static/images/1555824491105.png b/edaweb/static/images/1555824491105.png Binary files differindex 2e20fca..2e20fca 100644 --- a/static/images/1555824491105.png +++ b/edaweb/static/images/1555824491105.png diff --git a/static/images/1671540582317176.png b/edaweb/static/images/1671540582317176.png Binary files differindex dd741d3..dd741d3 100644 --- a/static/images/1671540582317176.png +++ b/edaweb/static/images/1671540582317176.png diff --git a/static/images/1urouter.jpg b/edaweb/static/images/1urouter.jpg Binary files differindex b295e59..b295e59 100755..100644 --- a/static/images/1urouter.jpg +++ b/edaweb/static/images/1urouter.jpg diff --git a/static/images/20220401_222149.jpg b/edaweb/static/images/20220401_222149.jpg Binary files differindex d9fecae..d9fecae 100644 --- a/static/images/20220401_222149.jpg +++ b/edaweb/static/images/20220401_222149.jpg diff --git a/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg b/edaweb/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg Binary files differindex cede48f..cede48f 100644 --- a/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg +++ b/edaweb/static/images/324162a23865a6a7e75761871d29935314cbc2b3.jpg diff --git a/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg b/edaweb/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg Binary files differindex 1f75924..1f75924 100755..100644 --- a/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg +++ b/edaweb/static/images/3502e26d0181c684bc17b56188bde6e80569d191_full.jpg diff --git a/static/images/5600x.jpg b/edaweb/static/images/5600x.jpg Binary files differindex f3995b2..f3995b2 100644 --- a/static/images/5600x.jpg +++ b/edaweb/static/images/5600x.jpg diff --git a/static/images/9400t.jpg b/edaweb/static/images/9400t.jpg Binary files differindex 175e8f1..175e8f1 100755..100644 --- a/static/images/9400t.jpg +++ b/edaweb/static/images/9400t.jpg diff --git a/static/images/9400t_cooler.jpg b/edaweb/static/images/9400t_cooler.jpg Binary files differindex dcfaf27..dcfaf27 100755..100644 --- a/static/images/9400t_cooler.jpg +++ b/edaweb/static/images/9400t_cooler.jpg diff --git a/static/images/E1NlPc1X0AEkB-s.png b/edaweb/static/images/E1NlPc1X0AEkB-s.png Binary files differindex b0be028..b0be028 100755..100644 --- a/static/images/E1NlPc1X0AEkB-s.png +++ b/edaweb/static/images/E1NlPc1X0AEkB-s.png diff --git a/static/images/E3xdm-hWYAEADNx.jpg b/edaweb/static/images/E3xdm-hWYAEADNx.jpg Binary files differindex d14513d..d14513d 100755..100644 --- a/static/images/E3xdm-hWYAEADNx.jpg +++ b/edaweb/static/images/E3xdm-hWYAEADNx.jpg diff --git a/static/images/E4WhXAvWYAIFwEa.png b/edaweb/static/images/E4WhXAvWYAIFwEa.png Binary files differindex 144eb45..144eb45 100755..100644 --- a/static/images/E4WhXAvWYAIFwEa.png +++ b/edaweb/static/images/E4WhXAvWYAIFwEa.png diff --git a/static/images/E4cjVaPXEAU83U0.png b/edaweb/static/images/E4cjVaPXEAU83U0.png Binary files differindex 941a436..941a436 100755..100644 --- a/static/images/E4cjVaPXEAU83U0.png +++ b/edaweb/static/images/E4cjVaPXEAU83U0.png diff --git a/static/images/E7ODIBeX0AAivRV.jpg b/edaweb/static/images/E7ODIBeX0AAivRV.jpg Binary files differindex dc52196..dc52196 100755..100644 --- a/static/images/E7ODIBeX0AAivRV.jpg +++ b/edaweb/static/images/E7ODIBeX0AAivRV.jpg diff --git a/static/images/E7ODIZEWUAMQjty.jpg b/edaweb/static/images/E7ODIZEWUAMQjty.jpg Binary files differindex 2e90eda..2e90eda 100755..100644 --- a/static/images/E7ODIZEWUAMQjty.jpg +++ b/edaweb/static/images/E7ODIZEWUAMQjty.jpg diff --git a/static/images/E7ODIv0WUAUp-ad.jpg b/edaweb/static/images/E7ODIv0WUAUp-ad.jpg Binary files differindex 97e704e..97e704e 100755..100644 --- a/static/images/E7ODIv0WUAUp-ad.jpg +++ b/edaweb/static/images/E7ODIv0WUAUp-ad.jpg diff --git a/static/images/E7ODJELX0AAVqna.jpg b/edaweb/static/images/E7ODJELX0AAVqna.jpg Binary files differindex eedfb14..eedfb14 100755..100644 --- a/static/images/E7ODJELX0AAVqna.jpg +++ b/edaweb/static/images/E7ODJELX0AAVqna.jpg diff --git a/static/images/EbmVCYKWkAAwXKW.jpg b/edaweb/static/images/EbmVCYKWkAAwXKW.jpg Binary files differindex 20b3a19..20b3a19 100755..100644 --- a/static/images/EbmVCYKWkAAwXKW.jpg +++ b/edaweb/static/images/EbmVCYKWkAAwXKW.jpg diff --git a/edaweb/static/images/Ffi1ducXEAArXDg.jpg b/edaweb/static/images/Ffi1ducXEAArXDg.jpg Binary files differnew file mode 100644 index 0000000..5c31cc5 --- /dev/null +++ b/edaweb/static/images/Ffi1ducXEAArXDg.jpg diff --git a/static/images/GGBDzuSXMAA1Ktk.jpg b/edaweb/static/images/GGBDzuSXMAA1Ktk.jpg Binary files differindex 35e04e1..35e04e1 100644 --- a/static/images/GGBDzuSXMAA1Ktk.jpg +++ b/edaweb/static/images/GGBDzuSXMAA1Ktk.jpg diff --git a/static/images/GSxGe_rXQAAgEhj.jpg b/edaweb/static/images/GSxGe_rXQAAgEhj.jpg Binary files differindex 0351920..0351920 100644 --- a/static/images/GSxGe_rXQAAgEhj.jpg +++ b/edaweb/static/images/GSxGe_rXQAAgEhj.jpg diff --git a/static/images/GTq-GOgWQAErvCp.jpg b/edaweb/static/images/GTq-GOgWQAErvCp.jpg Binary files differindex 6a2f7b4..6a2f7b4 100644 --- a/static/images/GTq-GOgWQAErvCp.jpg +++ b/edaweb/static/images/GTq-GOgWQAErvCp.jpg diff --git a/edaweb/static/images/GZhgzaK.png b/edaweb/static/images/GZhgzaK.png Binary files differnew file mode 100755 index 0000000..c73e8b4 --- /dev/null +++ b/edaweb/static/images/GZhgzaK.png diff --git a/static/images/GcyexeCW0AAYssz.jpg b/edaweb/static/images/GcyexeCW0AAYssz.jpg Binary files differindex c0762a8..c0762a8 100644 --- a/static/images/GcyexeCW0AAYssz.jpg +++ b/edaweb/static/images/GcyexeCW0AAYssz.jpg diff --git a/edaweb/static/images/GegzRla.png b/edaweb/static/images/GegzRla.png Binary files differnew file mode 100755 index 0000000..cf12555 --- /dev/null +++ b/edaweb/static/images/GegzRla.png diff --git a/static/images/IMG_-g4wqat.jpg b/edaweb/static/images/IMG_-g4wqat.jpg Binary files differindex 9f05aaf..9f05aaf 100755..100644 --- a/static/images/IMG_-g4wqat.jpg +++ b/edaweb/static/images/IMG_-g4wqat.jpg diff --git a/static/images/IMG_1602.jpg b/edaweb/static/images/IMG_1602.jpg Binary files differindex d1937fb..d1937fb 100644 --- a/static/images/IMG_1602.jpg +++ b/edaweb/static/images/IMG_1602.jpg diff --git a/static/images/IMG_1603.jpg b/edaweb/static/images/IMG_1603.jpg Binary files differindex 4d3e8c1..4d3e8c1 100644 --- a/static/images/IMG_1603.jpg +++ b/edaweb/static/images/IMG_1603.jpg diff --git a/static/images/IMG_1604.jpg b/edaweb/static/images/IMG_1604.jpg Binary files differindex 4cc82c3..4cc82c3 100644 --- a/static/images/IMG_1604.jpg +++ b/edaweb/static/images/IMG_1604.jpg diff --git a/static/images/IMG_1605.jpg b/edaweb/static/images/IMG_1605.jpg Binary files differindex 38d6770..38d6770 100644 --- a/static/images/IMG_1605.jpg +++ b/edaweb/static/images/IMG_1605.jpg diff --git a/static/images/IMG_1606.jpg b/edaweb/static/images/IMG_1606.jpg Binary files differindex fcbe2a4..fcbe2a4 100644 --- a/static/images/IMG_1606.jpg +++ b/edaweb/static/images/IMG_1606.jpg diff --git a/static/images/IMG_1607.jpg b/edaweb/static/images/IMG_1607.jpg Binary files differindex 825e338..825e338 100644 --- a/static/images/IMG_1607.jpg +++ b/edaweb/static/images/IMG_1607.jpg diff --git a/static/images/IMG_1609.jpg b/edaweb/static/images/IMG_1609.jpg Binary files differindex 6b7d834..6b7d834 100644 --- a/static/images/IMG_1609.jpg +++ b/edaweb/static/images/IMG_1609.jpg diff --git a/static/images/IMG_1610.jpg b/edaweb/static/images/IMG_1610.jpg Binary files differindex d201596..d201596 100644 --- a/static/images/IMG_1610.jpg +++ b/edaweb/static/images/IMG_1610.jpg diff --git a/static/images/IMG_1611.jpg b/edaweb/static/images/IMG_1611.jpg Binary files differindex 9eb1af5..9eb1af5 100644 --- a/static/images/IMG_1611.jpg +++ b/edaweb/static/images/IMG_1611.jpg diff --git a/static/images/IMG_1612.jpg b/edaweb/static/images/IMG_1612.jpg Binary files differindex f176c17..f176c17 100644 --- a/static/images/IMG_1612.jpg +++ b/edaweb/static/images/IMG_1612.jpg diff --git a/static/images/IMG_1613.png b/edaweb/static/images/IMG_1613.png Binary files differindex 63b743a..63b743a 100644 --- a/static/images/IMG_1613.png +++ b/edaweb/static/images/IMG_1613.png diff --git a/static/images/IMG_1614.png b/edaweb/static/images/IMG_1614.png Binary files differindex 349afb7..349afb7 100644 --- a/static/images/IMG_1614.png +++ b/edaweb/static/images/IMG_1614.png diff --git a/static/images/IMG_1615.jpg b/edaweb/static/images/IMG_1615.jpg Binary files differindex da42a2b..da42a2b 100644 --- a/static/images/IMG_1615.jpg +++ b/edaweb/static/images/IMG_1615.jpg diff --git a/static/images/IMG_1616.jpg b/edaweb/static/images/IMG_1616.jpg Binary files differindex 6f83c38..6f83c38 100644 --- a/static/images/IMG_1616.jpg +++ b/edaweb/static/images/IMG_1616.jpg diff --git a/static/images/IMG_1617.jpg b/edaweb/static/images/IMG_1617.jpg Binary files differindex 7528c7d..7528c7d 100644 --- a/static/images/IMG_1617.jpg +++ b/edaweb/static/images/IMG_1617.jpg diff --git a/static/images/IMG_1618.jpg b/edaweb/static/images/IMG_1618.jpg Binary files differindex 9b82ea1..9b82ea1 100644 --- a/static/images/IMG_1618.jpg +++ b/edaweb/static/images/IMG_1618.jpg diff --git a/static/images/IMG_1619.jpg b/edaweb/static/images/IMG_1619.jpg Binary files differindex ccae28a..ccae28a 100644 --- a/static/images/IMG_1619.jpg +++ b/edaweb/static/images/IMG_1619.jpg diff --git a/static/images/IMG_1620.jpg b/edaweb/static/images/IMG_1620.jpg Binary files differindex 54e92d6..54e92d6 100644 --- a/static/images/IMG_1620.jpg +++ b/edaweb/static/images/IMG_1620.jpg diff --git a/static/images/IMG_1621.jpg b/edaweb/static/images/IMG_1621.jpg Binary files differindex 5aebae0..5aebae0 100644 --- a/static/images/IMG_1621.jpg +++ b/edaweb/static/images/IMG_1621.jpg diff --git a/static/images/IMG_1622.jpg b/edaweb/static/images/IMG_1622.jpg Binary files differindex 56cc9c3..56cc9c3 100644 --- a/static/images/IMG_1622.jpg +++ b/edaweb/static/images/IMG_1622.jpg diff --git a/static/images/IMG_1623.jpg b/edaweb/static/images/IMG_1623.jpg Binary files differindex 43d0107..43d0107 100644 --- a/static/images/IMG_1623.jpg +++ b/edaweb/static/images/IMG_1623.jpg diff --git a/static/images/IMG_1624.png b/edaweb/static/images/IMG_1624.png Binary files differindex 4fd690f..4fd690f 100644 --- a/static/images/IMG_1624.png +++ b/edaweb/static/images/IMG_1624.png diff --git a/static/images/IMG_1625.jpg b/edaweb/static/images/IMG_1625.jpg Binary files differindex 496a7fa..496a7fa 100644 --- a/static/images/IMG_1625.jpg +++ b/edaweb/static/images/IMG_1625.jpg diff --git a/static/images/IMG_1626.jpg b/edaweb/static/images/IMG_1626.jpg Binary files differindex 90060fb..90060fb 100644 --- a/static/images/IMG_1626.jpg +++ b/edaweb/static/images/IMG_1626.jpg diff --git a/static/images/IMG_1627.jpg b/edaweb/static/images/IMG_1627.jpg Binary files differindex 90c4f49..90c4f49 100644 --- a/static/images/IMG_1627.jpg +++ b/edaweb/static/images/IMG_1627.jpg diff --git a/static/images/IMG_1628.jpg b/edaweb/static/images/IMG_1628.jpg Binary files differindex f2cc8c6..f2cc8c6 100644 --- a/static/images/IMG_1628.jpg +++ b/edaweb/static/images/IMG_1628.jpg diff --git a/static/images/IMG_1629.jpg b/edaweb/static/images/IMG_1629.jpg Binary files differindex b19b03e..b19b03e 100644 --- a/static/images/IMG_1629.jpg +++ b/edaweb/static/images/IMG_1629.jpg diff --git a/static/images/IMG_1630.jpg b/edaweb/static/images/IMG_1630.jpg Binary files differindex ddef77b..ddef77b 100644 --- a/static/images/IMG_1630.jpg +++ b/edaweb/static/images/IMG_1630.jpg diff --git a/static/images/IMG_1632.jpg b/edaweb/static/images/IMG_1632.jpg Binary files differindex 070615a..070615a 100644 --- a/static/images/IMG_1632.jpg +++ b/edaweb/static/images/IMG_1632.jpg diff --git a/static/images/IMG_1633.jpg b/edaweb/static/images/IMG_1633.jpg Binary files differindex 6fa7ae8..6fa7ae8 100644 --- a/static/images/IMG_1633.jpg +++ b/edaweb/static/images/IMG_1633.jpg diff --git a/static/images/IMG_1636.jpg b/edaweb/static/images/IMG_1636.jpg Binary files differindex a3de5ad..a3de5ad 100644 --- a/static/images/IMG_1636.jpg +++ b/edaweb/static/images/IMG_1636.jpg diff --git a/static/images/IMG_1637.jpg b/edaweb/static/images/IMG_1637.jpg Binary files differindex 8e6b489..8e6b489 100644 --- a/static/images/IMG_1637.jpg +++ b/edaweb/static/images/IMG_1637.jpg diff --git a/static/images/IMG_1638.jpg b/edaweb/static/images/IMG_1638.jpg Binary files differindex b9ca9f3..b9ca9f3 100644 --- a/static/images/IMG_1638.jpg +++ b/edaweb/static/images/IMG_1638.jpg diff --git a/static/images/IMG_1639.jpg b/edaweb/static/images/IMG_1639.jpg Binary files differindex 5695e58..5695e58 100644 --- a/static/images/IMG_1639.jpg +++ b/edaweb/static/images/IMG_1639.jpg diff --git a/static/images/IMG_1640.jpg b/edaweb/static/images/IMG_1640.jpg Binary files differindex df3eaea..df3eaea 100644 --- a/static/images/IMG_1640.jpg +++ b/edaweb/static/images/IMG_1640.jpg diff --git a/static/images/IMG_1641.jpg b/edaweb/static/images/IMG_1641.jpg Binary files differindex ce2eddb..ce2eddb 100644 --- a/static/images/IMG_1641.jpg +++ b/edaweb/static/images/IMG_1641.jpg diff --git a/static/images/IMG_20210422_212009.jpg b/edaweb/static/images/IMG_20210422_212009.jpg Binary files differindex a8337c4..a8337c4 100755..100644 --- a/static/images/IMG_20210422_212009.jpg +++ b/edaweb/static/images/IMG_20210422_212009.jpg diff --git a/static/images/IMG_20210824_175000.jpg b/edaweb/static/images/IMG_20210824_175000.jpg Binary files differindex 216c617..216c617 100755..100644 --- a/static/images/IMG_20210824_175000.jpg +++ b/edaweb/static/images/IMG_20210824_175000.jpg diff --git a/static/images/IMG_20220809_172130442_HDR.jpg b/edaweb/static/images/IMG_20220809_172130442_HDR.jpg Binary files differindex e1987f8..e1987f8 100755..100644 --- a/static/images/IMG_20220809_172130442_HDR.jpg +++ b/edaweb/static/images/IMG_20220809_172130442_HDR.jpg diff --git a/static/images/IMG_20220811_133224877_HDR.jpg b/edaweb/static/images/IMG_20220811_133224877_HDR.jpg Binary files differindex eb05b1b..eb05b1b 100755..100644 --- a/static/images/IMG_20220811_133224877_HDR.jpg +++ b/edaweb/static/images/IMG_20220811_133224877_HDR.jpg diff --git a/static/images/IMG_20220811_133224877_HDR_crop.jpg b/edaweb/static/images/IMG_20220811_133224877_HDR_crop.jpg Binary files differindex 7bc63ba..7bc63ba 100755..100644 --- a/static/images/IMG_20220811_133224877_HDR_crop.jpg +++ b/edaweb/static/images/IMG_20220811_133224877_HDR_crop.jpg diff --git a/static/images/IMG_20220812_112838125_HDR.jpg b/edaweb/static/images/IMG_20220812_112838125_HDR.jpg Binary files differindex 6e56a49..6e56a49 100755..100644 --- a/static/images/IMG_20220812_112838125_HDR.jpg +++ b/edaweb/static/images/IMG_20220812_112838125_HDR.jpg diff --git a/static/images/IMG_20220823_154457137_HDR.jpg b/edaweb/static/images/IMG_20220823_154457137_HDR.jpg Binary files differindex b46f0fe..b46f0fe 100755..100644 --- a/static/images/IMG_20220823_154457137_HDR.jpg +++ b/edaweb/static/images/IMG_20220823_154457137_HDR.jpg diff --git a/static/images/IMG_20221023_163821542.jpg b/edaweb/static/images/IMG_20221023_163821542.jpg Binary files differindex f2284df..f2284df 100755..100644 --- a/static/images/IMG_20221023_163821542.jpg +++ b/edaweb/static/images/IMG_20221023_163821542.jpg diff --git a/static/images/IMG_20230812_132400733_HDR.jpg b/edaweb/static/images/IMG_20230812_132400733_HDR.jpg Binary files differindex 9f46bdc..9f46bdc 100755..100644 --- a/static/images/IMG_20230812_132400733_HDR.jpg +++ b/edaweb/static/images/IMG_20230812_132400733_HDR.jpg diff --git a/static/images/IMG_20230812_132632784_HDR.jpg b/edaweb/static/images/IMG_20230812_132632784_HDR.jpg Binary files differindex 82060d1..82060d1 100755..100644 --- a/static/images/IMG_20230812_132632784_HDR.jpg +++ b/edaweb/static/images/IMG_20230812_132632784_HDR.jpg diff --git a/edaweb/static/images/JwL2S2V.png b/edaweb/static/images/JwL2S2V.png Binary files differnew file mode 100755 index 0000000..9394c56 --- /dev/null +++ b/edaweb/static/images/JwL2S2V.png diff --git a/edaweb/static/images/PXL_20250314_150055804.jpg b/edaweb/static/images/PXL_20250314_150055804.jpg Binary files differnew file mode 100644 index 0000000..b660e18 --- /dev/null +++ b/edaweb/static/images/PXL_20250314_150055804.jpg diff --git a/static/images/Screenshot_20210520-221830.png b/edaweb/static/images/Screenshot_20210520-221830.png Binary files differindex 33afee7..33afee7 100755..100644 --- a/static/images/Screenshot_20210520-221830.png +++ b/edaweb/static/images/Screenshot_20210520-221830.png diff --git a/static/images/Screenshot_20210527_122432.png b/edaweb/static/images/Screenshot_20210527_122432.png Binary files differindex 33432ff..33432ff 100755..100644 --- a/static/images/Screenshot_20210527_122432.png +++ b/edaweb/static/images/Screenshot_20210527_122432.png diff --git a/static/images/Screenshot_20210620-144127.png b/edaweb/static/images/Screenshot_20210620-144127.png Binary files differindex dd9b43a..dd9b43a 100755..100644 --- a/static/images/Screenshot_20210620-144127.png +++ b/edaweb/static/images/Screenshot_20210620-144127.png diff --git a/static/images/Screenshot_20210620-231652.png b/edaweb/static/images/Screenshot_20210620-231652.png Binary files differindex 5e2532d..5e2532d 100755..100644 --- a/static/images/Screenshot_20210620-231652.png +++ b/edaweb/static/images/Screenshot_20210620-231652.png diff --git a/static/images/Screenshot_20210727-072303.png b/edaweb/static/images/Screenshot_20210727-072303.png Binary files differindex 7c03644..7c03644 100755..100644 --- a/static/images/Screenshot_20210727-072303.png +++ b/edaweb/static/images/Screenshot_20210727-072303.png diff --git a/static/images/Screenshot_20210727-072344.png b/edaweb/static/images/Screenshot_20210727-072344.png Binary files differindex 248644a..248644a 100755..100644 --- a/static/images/Screenshot_20210727-072344.png +++ b/edaweb/static/images/Screenshot_20210727-072344.png diff --git a/static/images/Screenshot_20210727-223004.png b/edaweb/static/images/Screenshot_20210727-223004.png Binary files differindex dbe0630..dbe0630 100755..100644 --- a/static/images/Screenshot_20210727-223004.png +++ b/edaweb/static/images/Screenshot_20210727-223004.png diff --git a/static/images/Screenshot_20210731-181223.png b/edaweb/static/images/Screenshot_20210731-181223.png Binary files differindex b1547be..b1547be 100755..100644 --- a/static/images/Screenshot_20210731-181223.png +++ b/edaweb/static/images/Screenshot_20210731-181223.png diff --git a/static/images/Screenshot_20210731-181229.png b/edaweb/static/images/Screenshot_20210731-181229.png Binary files differindex 363c17b..363c17b 100755..100644 --- a/static/images/Screenshot_20210731-181229.png +++ b/edaweb/static/images/Screenshot_20210731-181229.png diff --git a/static/images/Screenshot_20210811-125853.png b/edaweb/static/images/Screenshot_20210811-125853.png Binary files differindex 7d45240..7d45240 100755..100644 --- a/static/images/Screenshot_20210811-125853.png +++ b/edaweb/static/images/Screenshot_20210811-125853.png diff --git a/static/images/Screenshot_20210818-203828.png b/edaweb/static/images/Screenshot_20210818-203828.png Binary files differindex 8026a0c..8026a0c 100755..100644 --- a/static/images/Screenshot_20210818-203828.png +++ b/edaweb/static/images/Screenshot_20210818-203828.png diff --git a/static/images/Screenshot_20210825-131938.png b/edaweb/static/images/Screenshot_20210825-131938.png Binary files differindex 4b16443..4b16443 100755..100644 --- a/static/images/Screenshot_20210825-131938.png +++ b/edaweb/static/images/Screenshot_20210825-131938.png diff --git a/static/images/Startech.jpg b/edaweb/static/images/Startech.jpg Binary files differindex ba7f02f..ba7f02f 100644 --- a/static/images/Startech.jpg +++ b/edaweb/static/images/Startech.jpg diff --git a/static/images/a4-5000.jpg b/edaweb/static/images/a4-5000.jpg Binary files differindex f26fd66..f26fd66 100755..100644 --- a/static/images/a4-5000.jpg +++ b/edaweb/static/images/a4-5000.jpg diff --git a/edaweb/static/images/aLvcFjj.png b/edaweb/static/images/aLvcFjj.png Binary files differnew file mode 100755 index 0000000..c928ba7 --- /dev/null +++ b/edaweb/static/images/aLvcFjj.png diff --git a/static/images/aaaaahh.jpg b/edaweb/static/images/aaaaahh.jpg Binary files differindex 8dac9d4..8dac9d4 100755..100644 --- a/static/images/aaaaahh.jpg +++ b/edaweb/static/images/aaaaahh.jpg diff --git a/static/images/anti_nft_b.png b/edaweb/static/images/anti_nft_b.png Binary files differindex 61dfb99..61dfb99 100644 --- a/static/images/anti_nft_b.png +++ b/edaweb/static/images/anti_nft_b.png diff --git a/static/images/arenas.jpg b/edaweb/static/images/arenas.jpg Binary files differindex 2b2cac6..2b2cac6 100644 --- a/static/images/arenas.jpg +++ b/edaweb/static/images/arenas.jpg diff --git a/static/images/basil.jpg b/edaweb/static/images/basil.jpg Binary files differindex c63ba48..c63ba48 100755..100644 --- a/static/images/basil.jpg +++ b/edaweb/static/images/basil.jpg diff --git a/static/images/bigshark.png b/edaweb/static/images/bigshark.png Binary files differindex a499fb1..a499fb1 100755..100644 --- a/static/images/bigshark.png +++ b/edaweb/static/images/bigshark.png diff --git a/static/images/bob.gif b/edaweb/static/images/bob.gif Binary files differindex 90b6dd5..90b6dd5 100755..100644 --- a/static/images/bob.gif +++ b/edaweb/static/images/bob.gif diff --git a/static/images/braindamage.png b/edaweb/static/images/braindamage.png Binary files differindex c26e75f..c26e75f 100755..100644 --- a/static/images/braindamage.png +++ b/edaweb/static/images/braindamage.png diff --git a/static/images/catonlap.jpg b/edaweb/static/images/catonlap.jpg Binary files differindex 37e526b..37e526b 100644 --- a/static/images/catonlap.jpg +++ b/edaweb/static/images/catonlap.jpg diff --git a/static/images/chuddy.jpg b/edaweb/static/images/chuddy.jpg Binary files differindex 7d732f7..7d732f7 100644 --- a/static/images/chuddy.jpg +++ b/edaweb/static/images/chuddy.jpg diff --git a/edaweb/static/images/cloudfree.png b/edaweb/static/images/cloudfree.png Binary files differnew file mode 100644 index 0000000..71c6ff2 --- /dev/null +++ b/edaweb/static/images/cloudfree.png diff --git a/static/images/embedded_img2.png b/edaweb/static/images/embedded_img2.png Binary files differindex 3eeea56..3eeea56 100755..100644 --- a/static/images/embedded_img2.png +++ b/edaweb/static/images/embedded_img2.png diff --git a/static/images/embedded_img3.png b/edaweb/static/images/embedded_img3.png Binary files differindex 2a55742..2a55742 100755..100644 --- a/static/images/embedded_img3.png +++ b/edaweb/static/images/embedded_img3.png diff --git a/static/images/embedded_img4.png b/edaweb/static/images/embedded_img4.png Binary files differindex 5e6ec6d..5e6ec6d 100755..100644 --- a/static/images/embedded_img4.png +++ b/edaweb/static/images/embedded_img4.png diff --git a/static/images/embedded_img5.PNG b/edaweb/static/images/embedded_img5.PNG Binary files differindex c96d284..c96d284 100755..100644 --- a/static/images/embedded_img5.PNG +++ b/edaweb/static/images/embedded_img5.PNG diff --git a/static/images/face.jpg b/edaweb/static/images/face.jpg Binary files differindex b123e53..b123e53 100755..100644 --- a/static/images/face.jpg +++ b/edaweb/static/images/face.jpg diff --git a/static/images/first_server.jpg b/edaweb/static/images/first_server.jpg Binary files differindex 8f537d7..8f537d7 100755..100644 --- a/static/images/first_server.jpg +++ b/edaweb/static/images/first_server.jpg diff --git a/static/images/fstab.png b/edaweb/static/images/fstab.png Binary files differindex 6acaa83..6acaa83 100755..100644 --- a/static/images/fstab.png +++ b/edaweb/static/images/fstab.png diff --git a/static/images/graduation.jpg b/edaweb/static/images/graduation.jpg Binary files differindex 89bafd7..89bafd7 100644 --- a/static/images/graduation.jpg +++ b/edaweb/static/images/graduation.jpg diff --git a/static/images/greenboi.jpg b/edaweb/static/images/greenboi.jpg Binary files differindex 7761c8a..7761c8a 100755..100644 --- a/static/images/greenboi.jpg +++ b/edaweb/static/images/greenboi.jpg diff --git a/static/images/hpkvm_puttyconf.png b/edaweb/static/images/hpkvm_puttyconf.png Binary files differindex 5e9852f..5e9852f 100755..100644 --- a/static/images/hpkvm_puttyconf.png +++ b/edaweb/static/images/hpkvm_puttyconf.png diff --git a/static/images/hpkvm_serialconf.png b/edaweb/static/images/hpkvm_serialconf.png Binary files differindex 76122c1..76122c1 100755..100644 --- a/static/images/hpkvm_serialconf.png +++ b/edaweb/static/images/hpkvm_serialconf.png diff --git a/static/images/i5-1145G7.png b/edaweb/static/images/i5-1145G7.png Binary files differindex 96b6fa3..96b6fa3 100644 --- a/static/images/i5-1145G7.png +++ b/edaweb/static/images/i5-1145G7.png diff --git a/edaweb/static/images/iKVCEoy.png b/edaweb/static/images/iKVCEoy.png Binary files differnew file mode 100755 index 0000000..05d6d70 --- /dev/null +++ b/edaweb/static/images/iKVCEoy.png diff --git a/static/images/icons.png b/edaweb/static/images/icons.png Binary files differindex 4f19e72..4f19e72 100755..100644 --- a/static/images/icons.png +++ b/edaweb/static/images/icons.png diff --git a/static/images/ioporn.jpg b/edaweb/static/images/ioporn.jpg Binary files differindex 6608d31..6608d31 100755..100644 --- a/static/images/ioporn.jpg +++ b/edaweb/static/images/ioporn.jpg diff --git a/static/images/its_true_1.jpg b/edaweb/static/images/its_true_1.jpg Binary files differindex 3dddfb3..3dddfb3 100755..100644 --- a/static/images/its_true_1.jpg +++ b/edaweb/static/images/its_true_1.jpg diff --git a/static/images/its_true_2.jpg b/edaweb/static/images/its_true_2.jpg Binary files differindex b532a21..b532a21 100755..100644 --- a/static/images/its_true_2.jpg +++ b/edaweb/static/images/its_true_2.jpg diff --git a/static/images/j1800.jpg b/edaweb/static/images/j1800.jpg Binary files differindex 05db3a6..05db3a6 100755..100644 --- a/static/images/j1800.jpg +++ b/edaweb/static/images/j1800.jpg diff --git a/static/images/j5040.jpg b/edaweb/static/images/j5040.jpg Binary files differindex 1a24299..1a24299 100755..100644 --- a/static/images/j5040.jpg +++ b/edaweb/static/images/j5040.jpg diff --git a/static/images/j5040_server.jpg b/edaweb/static/images/j5040_server.jpg Binary files differindex 9e2f3aa..9e2f3aa 100755..100644 --- a/static/images/j5040_server.jpg +++ b/edaweb/static/images/j5040_server.jpg diff --git a/static/images/kvm_1.png b/edaweb/static/images/kvm_1.png Binary files differindex fa05b15..fa05b15 100755..100644 --- a/static/images/kvm_1.png +++ b/edaweb/static/images/kvm_1.png diff --git a/static/images/kvm_2.png b/edaweb/static/images/kvm_2.png Binary files differindex 6fca0f8..6fca0f8 100755..100644 --- a/static/images/kvm_2.png +++ b/edaweb/static/images/kvm_2.png diff --git a/static/images/lackrack1.jpg b/edaweb/static/images/lackrack1.jpg Binary files differindex 31c4f9d..31c4f9d 100755..100644 --- a/static/images/lackrack1.jpg +++ b/edaweb/static/images/lackrack1.jpg diff --git a/static/images/lackrack2.jpg b/edaweb/static/images/lackrack2.jpg Binary files differindex 9fda7d8..9fda7d8 100755..100644 --- a/static/images/lackrack2.jpg +++ b/edaweb/static/images/lackrack2.jpg diff --git a/static/images/libreboot.jpg b/edaweb/static/images/libreboot.jpg Binary files differindex 0bac72e..0bac72e 100755..100644 --- a/static/images/libreboot.jpg +++ b/edaweb/static/images/libreboot.jpg diff --git a/static/images/liostore.png b/edaweb/static/images/liostore.png Binary files differindex 43003ee..43003ee 100755..100644 --- a/static/images/liostore.png +++ b/edaweb/static/images/liostore.png diff --git a/static/images/media_E9lTIldWUAEeT63.jpg b/edaweb/static/images/media_E9lTIldWUAEeT63.jpg Binary files differindex b30195a..b30195a 100755..100644 --- a/static/images/media_E9lTIldWUAEeT63.jpg +++ b/edaweb/static/images/media_E9lTIldWUAEeT63.jpg diff --git a/static/images/media_FPus_2aXsAUhCu9.jpg b/edaweb/static/images/media_FPus_2aXsAUhCu9.jpg Binary files differindex 398fadd..398fadd 100755..100644 --- a/static/images/media_FPus_2aXsAUhCu9.jpg +++ b/edaweb/static/images/media_FPus_2aXsAUhCu9.jpg diff --git a/static/images/media_FRlRqYKXoAIw82O.jpg b/edaweb/static/images/media_FRlRqYKXoAIw82O.jpg Binary files differindex b45a62b..b45a62b 100755..100644 --- a/static/images/media_FRlRqYKXoAIw82O.jpg +++ b/edaweb/static/images/media_FRlRqYKXoAIw82O.jpg diff --git a/static/images/media_FeP_m8FXEAAqcJs.jpg b/edaweb/static/images/media_FeP_m8FXEAAqcJs.jpg Binary files differindex f3afe10..f3afe10 100755..100644 --- a/static/images/media_FeP_m8FXEAAqcJs.jpg +++ b/edaweb/static/images/media_FeP_m8FXEAAqcJs.jpg diff --git a/static/images/media_FfcNNZ2WYAAz97v.jpg b/edaweb/static/images/media_FfcNNZ2WYAAz97v.jpg Binary files differindex 8ae39ad..8ae39ad 100755..100644 --- a/static/images/media_FfcNNZ2WYAAz97v.jpg +++ b/edaweb/static/images/media_FfcNNZ2WYAAz97v.jpg diff --git a/static/images/media_FlBsMq2XwAATJX5.jpg b/edaweb/static/images/media_FlBsMq2XwAATJX5.jpg Binary files differindex 7ba3ef1..7ba3ef1 100644 --- a/static/images/media_FlBsMq2XwAATJX5.jpg +++ b/edaweb/static/images/media_FlBsMq2XwAATJX5.jpg diff --git a/static/images/media_FlBsfDcWQAQhJdP.jpg b/edaweb/static/images/media_FlBsfDcWQAQhJdP.jpg Binary files differindex 601dfbe..601dfbe 100644 --- a/static/images/media_FlBsfDcWQAQhJdP.jpg +++ b/edaweb/static/images/media_FlBsfDcWQAQhJdP.jpg diff --git a/static/images/minecraft.png b/edaweb/static/images/minecraft.png Binary files differindex 19210d2..19210d2 100755..100644 --- a/static/images/minecraft.png +++ b/edaweb/static/images/minecraft.png diff --git a/static/images/new_switch_opened.jpg b/edaweb/static/images/new_switch_opened.jpg Binary files differindex df797ed..df797ed 100755..100644 --- a/static/images/new_switch_opened.jpg +++ b/edaweb/static/images/new_switch_opened.jpg diff --git a/static/images/newdiscord.jpg b/edaweb/static/images/newdiscord.jpg Binary files differindex d446602..d446602 100755..100644 --- a/static/images/newdiscord.jpg +++ b/edaweb/static/images/newdiscord.jpg diff --git a/static/images/nicfan.jpg b/edaweb/static/images/nicfan.jpg Binary files differindex 6c2415e..6c2415e 100755..100644 --- a/static/images/nicfan.jpg +++ b/edaweb/static/images/nicfan.jpg diff --git a/static/images/notstolenvalour4.png b/edaweb/static/images/notstolenvalour4.png Binary files differindex f9e82e2..f9e82e2 100644 --- a/static/images/notstolenvalour4.png +++ b/edaweb/static/images/notstolenvalour4.png diff --git a/static/images/notstolenvalour5.png b/edaweb/static/images/notstolenvalour5.png Binary files differindex 87c09da..87c09da 100644 --- a/static/images/notstolenvalour5.png +++ b/edaweb/static/images/notstolenvalour5.png diff --git a/edaweb/static/images/notstolenvalour8.png b/edaweb/static/images/notstolenvalour8.png Binary files differnew file mode 100644 index 0000000..dcddf27 --- /dev/null +++ b/edaweb/static/images/notstolenvalour8.png diff --git a/static/images/oldpic.png b/edaweb/static/images/oldpic.png Binary files differindex 20314e4..20314e4 100755..100644 --- a/static/images/oldpic.png +++ b/edaweb/static/images/oldpic.png diff --git a/static/images/pfsenseswissvpnportforwards.png b/edaweb/static/images/pfsenseswissvpnportforwards.png Binary files differindex 34c05dc..34c05dc 100644 --- a/static/images/pfsenseswissvpnportforwards.png +++ b/edaweb/static/images/pfsenseswissvpnportforwards.png diff --git a/static/images/photo_2022-12-07_14-06-03.jpg b/edaweb/static/images/photo_2022-12-07_14-06-03.jpg Binary files differindex 224b748..224b748 100755..100644 --- a/static/images/photo_2022-12-07_14-06-03.jpg +++ b/edaweb/static/images/photo_2022-12-07_14-06-03.jpg diff --git a/static/images/photo_5857106224099739202_y.jpg b/edaweb/static/images/photo_5857106224099739202_y.jpg Binary files differindex c0a5820..c0a5820 100644 --- a/static/images/photo_5857106224099739202_y.jpg +++ b/edaweb/static/images/photo_5857106224099739202_y.jpg diff --git a/static/images/powerani.gif b/edaweb/static/images/powerani.gif Binary files differindex 1eb1a18..1eb1a18 100644 --- a/static/images/powerani.gif +++ b/edaweb/static/images/powerani.gif diff --git a/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg b/edaweb/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg Binary files differindex 775d4e9..775d4e9 100755..100644 --- a/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg +++ b/edaweb/static/images/profile_images_1598652418580963328_ENk7xKDw.jpg diff --git a/edaweb/static/images/rOJXmjG.png b/edaweb/static/images/rOJXmjG.png Binary files differnew file mode 100755 index 0000000..58a4ae4 --- /dev/null +++ b/edaweb/static/images/rOJXmjG.png diff --git a/static/images/rack1.jpg b/edaweb/static/images/rack1.jpg Binary files differindex b5049e9..b5049e9 100755..100644 --- a/static/images/rack1.jpg +++ b/edaweb/static/images/rack1.jpg diff --git a/static/images/rack2.jpg b/edaweb/static/images/rack2.jpg Binary files differindex 1c9bc11..1c9bc11 100755..100644 --- a/static/images/rack2.jpg +++ b/edaweb/static/images/rack2.jpg diff --git a/static/images/router.jpg b/edaweb/static/images/router.jpg Binary files differindex 587f0e0..587f0e0 100755..100644 --- a/static/images/router.jpg +++ b/edaweb/static/images/router.jpg diff --git a/static/images/russian_isp.png b/edaweb/static/images/russian_isp.png Binary files differindex 5b529c0..5b529c0 100755..100644 --- a/static/images/russian_isp.png +++ b/edaweb/static/images/russian_isp.png diff --git a/static/images/russian_isp_abuse.png b/edaweb/static/images/russian_isp_abuse.png Binary files differindex 96da244..96da244 100755..100644 --- a/static/images/russian_isp_abuse.png +++ b/edaweb/static/images/russian_isp_abuse.png diff --git a/static/images/russian_nginx_logs.jpg b/edaweb/static/images/russian_nginx_logs.jpg Binary files differindex 3fe22d3..3fe22d3 100755..100644 --- a/static/images/russian_nginx_logs.jpg +++ b/edaweb/static/images/russian_nginx_logs.jpg diff --git a/static/images/russian_yt.jpg b/edaweb/static/images/russian_yt.jpg Binary files differindex 16f3767..16f3767 100755..100644 --- a/static/images/russian_yt.jpg +++ b/edaweb/static/images/russian_yt.jpg diff --git a/static/images/s-l1600.jpg b/edaweb/static/images/s-l1600.jpg Binary files differindex 34a82cf..34a82cf 100755..100644 --- a/static/images/s-l1600.jpg +++ b/edaweb/static/images/s-l1600.jpg diff --git a/static/images/s-l16001.jpg b/edaweb/static/images/s-l16001.jpg Binary files differindex 0c34348..0c34348 100755..100644 --- a/static/images/s-l16001.jpg +++ b/edaweb/static/images/s-l16001.jpg diff --git a/static/images/s-l500.jpg b/edaweb/static/images/s-l500.jpg Binary files differindex 92307ff..92307ff 100755..100644 --- a/static/images/s-l500.jpg +++ b/edaweb/static/images/s-l500.jpg diff --git a/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg b/edaweb/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg Binary files differindex b146bc4..b146bc4 100644 --- a/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg +++ b/edaweb/static/images/sample_ede336afca555579dd78f051e4a23feaa838716d.jpg diff --git a/static/images/selfie.jpg b/edaweb/static/images/selfie.jpg Binary files differindex 17730e8..17730e8 100755..100644 --- a/static/images/selfie.jpg +++ b/edaweb/static/images/selfie.jpg diff --git a/static/images/server.jpg b/edaweb/static/images/server.jpg Binary files differindex 50bc1d7..50bc1d7 100755..100644 --- a/static/images/server.jpg +++ b/edaweb/static/images/server.jpg diff --git a/static/images/server2.jpg b/edaweb/static/images/server2.jpg Binary files differindex dda70b1..dda70b1 100755..100644 --- a/static/images/server2.jpg +++ b/edaweb/static/images/server2.jpg diff --git a/static/images/shark1.jpg b/edaweb/static/images/shark1.jpg Binary files differindex 394846c..394846c 100755..100644 --- a/static/images/shark1.jpg +++ b/edaweb/static/images/shark1.jpg diff --git a/static/images/shark2.jpg b/edaweb/static/images/shark2.jpg Binary files differindex 2c432cd..2c432cd 100755..100644 --- a/static/images/shark2.jpg +++ b/edaweb/static/images/shark2.jpg diff --git a/static/images/shark3.jpg b/edaweb/static/images/shark3.jpg Binary files differindex 5343254..5343254 100755..100644 --- a/static/images/shark3.jpg +++ b/edaweb/static/images/shark3.jpg diff --git a/static/images/shark3.png b/edaweb/static/images/shark3.png Binary files differindex 22e8ff9..22e8ff9 100755..100644 --- a/static/images/shark3.png +++ b/edaweb/static/images/shark3.png diff --git a/edaweb/static/images/shun-hashimoto-mio-chibana.gif b/edaweb/static/images/shun-hashimoto-mio-chibana.gif Binary files differnew file mode 100644 index 0000000..869793f --- /dev/null +++ b/edaweb/static/images/shun-hashimoto-mio-chibana.gif diff --git a/static/images/sicp.jpg b/edaweb/static/images/sicp.jpg Binary files differindex 575a456..575a456 100755..100644 --- a/static/images/sicp.jpg +++ b/edaweb/static/images/sicp.jpg diff --git a/static/images/startech_rack_1.jpg b/edaweb/static/images/startech_rack_1.jpg Binary files differindex 1f66734..1f66734 100755..100644 --- a/static/images/startech_rack_1.jpg +++ b/edaweb/static/images/startech_rack_1.jpg diff --git a/static/images/startech_rack_2.jpg b/edaweb/static/images/startech_rack_2.jpg Binary files differindex 47f9aac..47f9aac 100755..100644 --- a/static/images/startech_rack_2.jpg +++ b/edaweb/static/images/startech_rack_2.jpg diff --git a/static/images/stolenvalour.jpg b/edaweb/static/images/stolenvalour.jpg Binary files differindex d666623..d666623 100644 --- a/static/images/stolenvalour.jpg +++ b/edaweb/static/images/stolenvalour.jpg diff --git a/static/images/sun.gif b/edaweb/static/images/sun.gif Binary files differindex 674e32a..674e32a 100755..100644 --- a/static/images/sun.gif +++ b/edaweb/static/images/sun.gif diff --git a/static/images/switch.jpg b/edaweb/static/images/switch.jpg Binary files differindex 64ab20c..64ab20c 100755..100644 --- a/static/images/switch.jpg +++ b/edaweb/static/images/switch.jpg diff --git a/static/images/switches.jpg b/edaweb/static/images/switches.jpg Binary files differindex 8b56651..8b56651 100755..100644 --- a/static/images/switches.jpg +++ b/edaweb/static/images/switches.jpg diff --git a/static/images/t30.jpg b/edaweb/static/images/t30.jpg Binary files differindex 949d14b..949d14b 100755..100644 --- a/static/images/t30.jpg +++ b/edaweb/static/images/t30.jpg diff --git a/static/images/techdome.jpg b/edaweb/static/images/techdome.jpg Binary files differindex 74fe69c..74fe69c 100644 --- a/static/images/techdome.jpg +++ b/edaweb/static/images/techdome.jpg diff --git a/static/images/telegrampic.jpg b/edaweb/static/images/telegrampic.jpg Binary files differindex ddadb8b..ddadb8b 100755..100644 --- a/static/images/telegrampic.jpg +++ b/edaweb/static/images/telegrampic.jpg diff --git a/static/images/telegrampic2.jpg b/edaweb/static/images/telegrampic2.jpg Binary files differindex 8b306ff..8b306ff 100755..100644 --- a/static/images/telegrampic2.jpg +++ b/edaweb/static/images/telegrampic2.jpg diff --git a/static/images/testimonials.PNG b/edaweb/static/images/testimonials.PNG Binary files differindex 8584cdd..8584cdd 100755..100644 --- a/static/images/testimonials.PNG +++ b/edaweb/static/images/testimonials.PNG diff --git a/static/images/theNVMEVault.png b/edaweb/static/images/theNVMEVault.png Binary files differindex 2cf31d7..2cf31d7 100755..100644 --- a/static/images/theNVMEVault.png +++ b/edaweb/static/images/theNVMEVault.png diff --git a/static/images/twitterpic.jpg b/edaweb/static/images/twitterpic.jpg Binary files differindex 57f16b4..57f16b4 100755..100644 --- a/static/images/twitterpic.jpg +++ b/edaweb/static/images/twitterpic.jpg diff --git a/edaweb/static/images/v2Yfoou.jpg b/edaweb/static/images/v2Yfoou.jpg Binary files differnew file mode 100755 index 0000000..f3a3249 --- /dev/null +++ b/edaweb/static/images/v2Yfoou.jpg diff --git a/static/images/vcss-blue.gif b/edaweb/static/images/vcss-blue.gif Binary files differindex c373b2a..c373b2a 100755..100644 --- a/static/images/vcss-blue.gif +++ b/edaweb/static/images/vcss-blue.gif diff --git a/static/images/www.gif b/edaweb/static/images/www.gif Binary files differindex 48fbd13..48fbd13 100644 --- a/static/images/www.gif +++ b/edaweb/static/images/www.gif diff --git a/edaweb/static/images/wxbKYVv.png b/edaweb/static/images/wxbKYVv.png Binary files differnew file mode 100755 index 0000000..75feb10 --- /dev/null +++ b/edaweb/static/images/wxbKYVv.png diff --git a/static/images/x200.jpg b/edaweb/static/images/x200.jpg Binary files differindex d7e48eb..d7e48eb 100755..100644 --- a/static/images/x200.jpg +++ b/edaweb/static/images/x200.jpg diff --git a/static/images/xeon.jpg b/edaweb/static/images/xeon.jpg Binary files differindex 4b1eef9..4b1eef9 100755..100644 --- a/static/images/xeon.jpg +++ b/edaweb/static/images/xeon.jpg diff --git a/static/images/xeon_motherboard.jpg b/edaweb/static/images/xeon_motherboard.jpg Binary files differindex a17819f..a17819f 100755..100644 --- a/static/images/xeon_motherboard.jpg +++ b/edaweb/static/images/xeon_motherboard.jpg diff --git a/static/index.md b/edaweb/static/index.md index 39bbc7c..e6bf91d 100755..100644 --- a/static/index.md +++ b/edaweb/static/index.md @@ -1,9 +1,9 @@ - - site now also avaliable under the domain [boymoder.blog](https://boymoder.blog)! + + ## haiiiiiii -my name is eden and im a 23yo (boymoder) computer science/robotics PhD student. i made my own website to encourage others to do so too. +my name is eden and im a 23yo (boymoder/[fujoshi](https://www.urbandictionary.com/define.php?term=fujoshi)) computer science/robotics PhD student. i made my own website to encourage others to do so too. i'll post my thoughts on here sometimes, and use this site to link to other stuff i host [more about me](/thought?id=2). [click here for a random image of lio fotia](/random?tags=lio_fotia) @@ -25,6 +25,9 @@ these sites are hosted on my [homelab system](https://wiki.eda.gay) ## nice websites - [wiby.me](http://wiby.me/) - search engine for old style websites with limited javascript (my site used to be on here but it got blacklisted for some reason?) +- [dysmorph.nekoweb.org](https://dysmorph.nekoweb.org/) - a site that is very based because it looks similar +- [transsexual.org](https://web.archive.org/web/20010802032136/http://transsexual.org/Toon.html) - awesome and relatable transsexual comics from a website that's slightly older than me +- [norfolkchurches.co.uk](http://www.norfolkchurches.co.uk/norwichintro.htm) - site about all the churches in norwich (and norfolk!), the city that has far too many medieval churches than it knows what to do with. this site is preciesly what the internet should be, the muted ramblings of someone with an expert knowledge on his preferred niche interest. without any javascript. nice if, like me, you have a middling interest in theology - [boymoder.network](https://boymoder.network/) - website for boymoder awareness - [4chan.org/lgbt/](https://boards.4channel.org/lgbt/) - but dont blame me if u catch brainworms - [https://www.math.uni-bielefeld.de/~sillke/Twister/fun/elevator-fun90.html](https://www.math.uni-bielefeld.de/~sillke/Twister/fun/elevator-fun90.html) any website with a URL like this is gonna be good diff --git a/edaweb/static/papers/aai.pdf b/edaweb/static/papers/aai.pdf Binary files differnew file mode 100644 index 0000000..af2223b --- /dev/null +++ b/edaweb/static/papers/aai.pdf diff --git a/edaweb/static/papers/ar2.pdf b/edaweb/static/papers/ar2.pdf Binary files differnew file mode 100644 index 0000000..2b1693f --- /dev/null +++ b/edaweb/static/papers/ar2.pdf diff --git a/edaweb/static/robots.txt b/edaweb/static/robots.txt new file mode 100644 index 0000000..04154e9 --- /dev/null +++ b/edaweb/static/robots.txt @@ -0,0 +1,7 @@ +User-agent: *
+Allow: /
+User-agent: Googlebot-Image
+Disallow: *
+User-agent: *
+Disallow: /random*
+
diff --git a/static/style.css b/edaweb/static/style.css index 6069ebf..6069ebf 100755..100644 --- a/static/style.css +++ b/edaweb/static/style.css diff --git a/templates/diary.html.j2 b/edaweb/templates/diary.html.j2 index f6604f7..f6604f7 100755..100644 --- a/templates/diary.html.j2 +++ b/edaweb/templates/diary.html.j2 diff --git a/templates/discord.html.j2 b/edaweb/templates/discord.html.j2 index 597fb4b..597fb4b 100755..100644 --- a/templates/discord.html.j2 +++ b/edaweb/templates/discord.html.j2 diff --git a/templates/index.html.j2 b/edaweb/templates/index.html.j2 index 53ca77e..d6c08d8 100755..100644 --- a/templates/index.html.j2 +++ b/edaweb/templates/index.html.j2 @@ -1,6 +1,7 @@ {% extends "template.html.j2" %} {% block content %} <aside> + <a><i>{{ "%d days until FFS" % days_till_ffs.days }}</i></a> <section id="recent_thoughts"> <h4>recent thoughts:</h4> <ul> diff --git a/templates/isocd.html.j2 b/edaweb/templates/isocd.html.j2 index 3c532c0..3c532c0 100755..100644 --- a/templates/isocd.html.j2 +++ b/edaweb/templates/isocd.html.j2 diff --git a/templates/isocd_confirmation.html.j2 b/edaweb/templates/isocd_confirmation.html.j2 index 81045a8..81045a8 100755..100644 --- a/templates/isocd_confirmation.html.j2 +++ b/edaweb/templates/isocd_confirmation.html.j2 diff --git a/templates/nhdl.html.j2 b/edaweb/templates/nhdl.html.j2 index 5ab62c2..5ab62c2 100755..100644 --- a/templates/nhdl.html.j2 +++ b/edaweb/templates/nhdl.html.j2 diff --git a/templates/questions.html.j2 b/edaweb/templates/questions.html.j2 index eb58380..eb58380 100644 --- a/templates/questions.html.j2 +++ b/edaweb/templates/questions.html.j2 diff --git a/templates/random.html.j2 b/edaweb/templates/random.html.j2 index 76b433b..76b433b 100755..100644 --- a/templates/random.html.j2 +++ b/edaweb/templates/random.html.j2 diff --git a/templates/services.html.j2 b/edaweb/templates/services.html.j2 index 9c9e5ec..9f42c7f 100755..100644 --- a/templates/services.html.j2 +++ b/edaweb/templates/services.html.j2 @@ -4,7 +4,7 @@ <section id=docker> <h2>docker</h2> <ul> - {% for host, containers in docker.items() %} + {% for host, containers in docker["containers"].items() %} <h4>{{ "%s - %s" % (host[0], host[1]) }}</h4> <table> {% for name, status, image in containers %} @@ -21,6 +21,7 @@ </table> {% endfor %} </ul> + <p>{{ docker["cachetime"] }}</p> </section> <section id="torrents"> diff --git a/templates/template.html.j2 b/edaweb/templates/template.html.j2 index 1c9e99e..86618bc 100755..100644 --- a/templates/template.html.j2 +++ b/edaweb/templates/template.html.j2 @@ -67,6 +67,7 @@ <img src="/img/www.gif"> <img src="/img/bob.gif"> <img src="/img/sun.gif"> + <img src="/img/cloudfree.png"> </div> <iframe src="https://john.citrons.xyz/embed?ref=eda.gay" style="padding-top:20px;margin-left:auto;display:block;margin-right:auto;max-width:732px;width:100%;height:94px;border:none;"></iframe> </footer> diff --git a/templates/thought.html.j2 b/edaweb/templates/thought.html.j2 index 2a5b519..2a5b519 100755..100644 --- a/templates/thought.html.j2 +++ b/edaweb/templates/thought.html.j2 diff --git a/templates/thoughts.html.j2 b/edaweb/templates/thoughts.html.j2 index bf06f57..bf06f57 100755..100644 --- a/templates/thoughts.html.j2 +++ b/edaweb/templates/thoughts.html.j2 diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..f8664f0 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,5 @@ +rm -rvf /app/edaweb/edaweb.conf/ +ln -s /app/edaweb.conf /app/edaweb/edaweb.conf +printenv | grep -v "no_proxy" >> /etc/environment +#tmux new-session -d -s "cron" 'cron -f || bash && bash'; +python3 /app/edaweb/app.py --production diff --git a/homelab-wiki/Dockerfile b/homelab-wiki/Dockerfile index 445bcc3..62b1f60 100644 --- a/homelab-wiki/Dockerfile +++ b/homelab-wiki/Dockerfile @@ -1,4 +1,4 @@ -FROM mediawiki:1.39.3 +FROM mediawiki:1.43.3 ENV MW_HOME=/var/www/html diff --git a/homelab-wiki/LocalSettings.php b/homelab-wiki/LocalSettings.php index e3c1d5a..e8e5eb2 100644 --- a/homelab-wiki/LocalSettings.php +++ b/homelab-wiki/LocalSettings.php @@ -30,7 +30,7 @@ $wgMetaNamespace = "Eden's_Homelab_Wiki"; $wgScriptPath = ""; ## The protocol and server name to use in fully-qualified URLs -$wgServer = "https://wiki.eda.gay"; +$wgServer = "https://homelabwiki.boymoder.blog"; ## The URL path to static resources (images, scripts, etc.) $wgResourceBasePath = $wgScriptPath; @@ -159,7 +159,6 @@ wfLoadExtension( 'ParserFunctions' ); wfLoadExtension( 'PdfHandler' ); wfLoadExtension( 'Poem' ); wfLoadExtension( 'PortableInfobox' ); -wfLoadExtension( 'Renameuser' ); wfLoadExtension( 'ReplaceText' ); wfLoadExtension( 'Scribunto' ); wfLoadExtension( 'SecureLinkFixer' ); @@ -174,7 +173,11 @@ wfLoadExtension( 'WikiEditor' ); # End of automatically generated settings. # Add more configuration options below. -$wgShowDebug = false; -$wgDevelopmentWarnings = false; -$wgShowExceptionDetails = false; -$wgDebugToolbar = false; +# $wgShowDebug = false; +# $wgDevelopmentWarnings = false; +# $wgShowExceptionDetails = false; +# $wgDebugToolbar = false; + +$wgShowExceptionDetails = true; +$wgShowDBErrorBacktrace = true; +$wgShowSQLErrors = true; diff --git a/nitter/nitter b/nitter/nitter deleted file mode 160000 -Subproject fcd74e8048362fcf8284871ee067099e8de28a8 diff --git a/requirements.txt b/requirements.txt index 581cd7c..8d51c87 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ -itsdangerous==2.0.1 PyMySQL==1.0.2 -transmission_rpc==4.1.0 -Werkzeug==2.3.7 +transmission_rpc==4.1.4 +Werkzeug==2.2.3 Flask==2.2.2 PiHole_api dataclasses @@ -18,4 +17,4 @@ Pygments mistune==2.0.3 twython==3.8.2 fabric -paramiko
\ No newline at end of file +paramiko diff --git a/scripts/export.sh b/scripts/export.sh index c65a6e9..1d17cf1 100755 --- a/scripts/export.sh +++ b/scripts/export.sh @@ -9,4 +9,4 @@ read export_name echo "Exporting blog post " $id " to " $export_name touch $export_name -sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$export_name":/app/$export_name --network mariadb --rm reg.reaweb.uk/edaweb /app/parser.py export -i $id -u root -o $export_name +sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb/edaweb.conf -v "$(pwd)/$export_name":/app/$export_name --network mariadb --rm reg.reaweb.uk/edaweb /app/edaweb/parser.py export -i $id -u root -o $export_name diff --git a/scripts/update.sh b/scripts/update.sh index b082f18..fe225cb 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -3,4 +3,4 @@ echo -n "Input blog post ID to update: " read id -sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$1":/app/$1 --network mariadb --rm reg.reaweb.uk/edaweb /app/parser.py update -i $id -u root -m $1 +sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb/edaweb.conf -v "$(pwd)/$1":/app/$1 --network mariadb --rm reg.reaweb.uk/edaweb /app/edaweb/parser.py update -i $id -u root -m $1 diff --git a/static/robots.txt b/static/robots.txt deleted file mode 100755 index c2aab7e..0000000 --- a/static/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: *
-Disallow: /
\ No newline at end of file |