From 7d03b80f7a2ecb5936a5881d46808a2f56a5f815 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Wed, 27 Sep 2023 20:45:30 +0200 Subject: [PATCH] add a link --- docker/db/scripts/gawa.sql | 35 +++++++++++++++++++++-------------- docker/main/Dockerfile | 3 ++- gawa/start/templates/nav.html | 2 +- startup.sh | 1 - 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/docker/db/scripts/gawa.sql b/docker/db/scripts/gawa.sql index 83d1525..a7842a8 100644 --- a/docker/db/scripts/gawa.sql +++ b/docker/db/scripts/gawa.sql @@ -3,7 +3,7 @@ -- https://www.phpmyadmin.net/ -- -- Host: db --- Erstellungszeit: 26. Sep 2023 um 20:24 +-- Erstellungszeit: 27. Sep 2023 um 18:44 -- Server-Version: 10.11.3-MariaDB-1:10.11.3+maria~ubu2204 -- PHP-Version: 8.1.19 @@ -138,7 +138,7 @@ CREATE TABLE `auth_user` ( -- INSERT INTO `auth_user` (`id`, `password`, `last_login`, `is_superuser`, `username`, `first_name`, `last_name`, `email`, `is_staff`, `is_active`, `date_joined`) VALUES -(1, 'pbkdf2_sha256$260000$cOxciSMkcV8kSVG1gUjOi7$LmOAxpppL7oBM2F+rFy0cdOZfReqdHqq1T6vw8PfODQ=', '2023-07-15 12:37:50.374280', 1, 'root', '', '', '', 1, 1, '2023-06-03 11:59:57.779755'); +(1, 'pbkdf2_sha256$260000$cOxciSMkcV8kSVG1gUjOi7$LmOAxpppL7oBM2F+rFy0cdOZfReqdHqq1T6vw8PfODQ=', '2023-09-26 20:47:23.142649', 1, 'root', '', '', '', 1, 1, '2023-06-03 11:59:57.779755'); -- -------------------------------------------------------- @@ -309,7 +309,9 @@ INSERT INTO `django_admin_log` (`id`, `action_time`, `object_id`, `object_repr`, (74, '2023-07-15 12:44:37.681112', '9', '{\"social media\"}', 1, '[{\"added\": {}}]', 1, 1), (75, '2023-07-15 12:44:47.420748', '10', '{\"mastodon\"}', 1, '[{\"added\": {}}]', 1, 1), (76, '2023-07-15 12:46:17.179222', 'https://infosec.exchange/@plexsheep/', '{\"Mastodon\"}', 1, '[{\"added\": {}}]', 12, 1), -(77, '2023-07-15 12:47:41.308504', 'https://cscherr.de', '{\"title EN\"}', 3, '', 12, 1); +(77, '2023-07-15 12:47:41.308504', 'https://cscherr.de', '{\"title EN\"}', 3, '', 12, 1), +(78, '2023-09-27 18:43:24.048812', '11', '{\"Hacking\"}', 1, '[{\"added\": {}}]', 1, 1), +(79, '2023-09-27 18:43:32.913389', 'https://cscg.de/', '{\"Cyber Security Challenge Germany\"}', 1, '[{\"added\": {}}]', 12, 1); -- -------------------------------------------------------- @@ -426,6 +428,7 @@ INSERT INTO `django_session` (`session_key`, `session_data`, `expire_date`) VALU ('90cu9ksglbxjuav0ycu34entpl3u4qze', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6DPn:FCYUrqa7sxjHrLAxvrd4xcXst3Bld3roZXiMIm6_F7g', '2023-06-19 16:50:43.835428'), ('9vrglur3tcfw30khosdk0whixdw5868f', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6DJf:JMQ65g3ch9bxIJXCyHfBkmz8xqpCFDLqCCEB-Fjk1j8', '2023-06-19 16:44:23.542502'), ('a4lile9twdhc1yhb4jm2v5arw3njpmej', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6bpg:OnpuTHTxOIhBWx00CQPrpYZhMxGIhsNypGHc_4oxT_Q', '2023-06-20 18:55:04.321078'), +('aj8r2xou6zmiev2qu09skea7uxl7mk4s', 'eyJfbGFuZ3VhZ2UiOiJlbiJ9:1qlEwK:PJsxynHSnR99RgKTXCdS04bczAM31zWnfKa_JbPQZJQ', '2023-10-10 20:45:52.004706'), ('b19ur3eet73u66lfhf7iowvb8e6ki2td', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6IJN:ZIdTfsHuPhlUBDAW9wvz2hoEtMH4NYqgkomYVIieAhY', '2023-06-19 22:04:25.445445'), ('b1xgysjxf4yjco704xam548jixstkxk4', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6IWp:gB20zXAKoPRbLklQlEzPAB2etNe510dvcw3HjZ2YqhE', '2023-06-19 22:18:19.426849'), ('evj2deqvxhbyxb49e9h6l9na2qbaqf95', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q5QmI:1rGcG2CjkEKezGaLrT8fLFdInLOqIDp2ctZb5w2h9eY', '2023-06-17 12:54:42.590440'), @@ -436,6 +439,7 @@ INSERT INTO `django_session` (`session_key`, `session_data`, `expire_date`) VALU ('ir5lngwwf38u4ro0dreraqdv7sy8fl4j', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1qkrLe:q--VIRxGKEfZEr1h28GRACqTPEwcSGOklzwjb2-BBco', '2023-10-09 19:34:26.798740'), ('jav4im7bxc31yig1weoojczl725hjetd', '.eJxVjDsOgzAQBe_iOrLwD-yU6TmDtbteAwkyEuAqyt0DEg3tvJn3FXGGMlQYWDwFF_EQEeo-xrrxGqd0QHVnCPThcg7pfZSLpKXs64TyVOS1brJfEs-vy70djLCNR20Qk2tyY3UO1gT0wWhEm5kaF6gNGdkZRc560IrYAOkWsLPOd4iEIH5_vbE96w:1qKfJc:bpPnwVuuqPB9oVGr8Revg7vj3eAIo1niHfWEmf8O0o0', '2023-07-29 13:28:04.767178'), ('jf3upknvj24cbyz5ucf2hvqes4o6brzf', 'eyJfbGFuZ3VhZ2UiOiJlbiJ9:1qAFve:_RL7IYW9MkLOwRPU7s-iljlJETcf2JNT8-s0CiQBgbI', '2023-06-30 20:20:18.080997'), +('nowaza4auf15ea5ceduizupmuoai5wed', '.eJxVjDsOgzAQBe_iOrLwD-yU6TmDtbteAwkyEuAqyt0DEg3tvJn3FXGGMlQYWDwFF_EQEeo-xrrxGqd0QHVnCPThcg7pfZSLpKXs64TyVOS1brJfEs-vy70djLCNR20Qk2tyY3UO1gT0wWhEm5kaF6gNGdkZRc560IrYAOkWsLPOd4iEIH5_vbE96w:1qlZTU:uwTe0XhXUDx5AoyAuiMe8bsgud4-dczCsuKKhjQxjno', '2023-10-11 18:41:28.391526'), ('nxbpuu69n360c4rtr30gatez80zceypc', 'eyJfbGFuZ3VhZ2UiOiJlbiJ9:1q5uwg:26g54m5XFWYTIyQ_XXmbuFM0dXKFK5PjIpnffTPooec', '2023-06-18 21:07:26.651759'), ('oksqlmqq4d95qbthf77cekpstsoras0x', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1qAHVI:zMwTYu2mF4TuMp3z6xyGegM5Z4dV2QOS4KErwB_42IY', '2023-06-30 22:01:12.013664'), ('ou12hhptv10i3dicpx9eg73qhr2c2spw', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1qAFve:D4NUcsnUU5BQLest9ZT3q98QlX1Vidt_wW73IIUcD0c', '2023-06-30 20:20:18.023866'), @@ -451,7 +455,6 @@ INSERT INTO `django_session` (`session_key`, `session_data`, `expire_date`) VALU ('t2kwan6ekp81crswrsi9hii4b61imuue', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6DnA:j-cI0mcCObdleGdnyjXwXCzYLi4AmXpo610VPxQBmM4', '2023-06-19 17:14:52.657342'), ('tvscp47jrsn5z4fzay4sozctp4o9tpr7', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6Ftl:fbR1czINKX_3OFLpBEjlPSoOqVf4B5Yx5U13i83cz2Y', '2023-06-19 19:29:49.516429'), ('ty2uxmb0kropbz7ag4yk848t4hen54j7', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6J1L:beudjtx8mUL9cLZg3z3PKqP5hW8lp_inxnyW3f3HEDk', '2023-06-19 22:49:51.870050'), -('uqoj1hi5e9zo7t3oxo7c3r3t3418sna6', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1qlEWB:qRG7fzsSQyV5A0bs3FLqDUozohBtoEvR7kP0ScJ8GAk', '2023-10-10 20:18:51.386851'), ('whu9nbomfw3i5gs8fttvjxacu247tuft', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6Drn:Eb7ima9uOKmHWTfkubqTkzHczghiDOglJCki3bib51I', '2023-06-19 17:19:39.665491'), ('z35tevuzugpk08wbgtlcvktitb5cuuvj', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1qkrLg:t7mBZwP_Vzcn3gtTR-jeZ3P779bwZI_4o502I-Erxks', '2023-10-09 19:34:28.894312'), ('zj7tnj6l3xwq4n2vy4eg1gsvmc7rgagx', 'eyJfbGFuZ3VhZ2UiOiJkZSJ9:1q6Czj:IPERPMMtjCuW4sOHOEc7FY58NgjY0u8Lh10NMcinf_Y', '2023-06-19 16:23:47.958648'); @@ -482,7 +485,8 @@ INSERT INTO `start_keyword` (`id`, `text_de`, `text_en`) VALUES (7, 'Selfhosting', 'selfhosting'), (8, 'Tool', 'tool'), (9, 'Social Media', 'social media'), -(10, 'Mastodon', 'mastodon'); +(10, 'Mastodon', 'mastodon'), +(11, 'Hacking', 'Hacking'); -- -------------------------------------------------------- @@ -503,9 +507,10 @@ CREATE TABLE `start_link` ( -- INSERT INTO `start_link` (`searchable_ptr_id`, `url`, `favicon`, `status`, `personal`) VALUES -(10, 'https://european-alternatives.eu/', 'img/links/favicons/favicon-15454.png', 1, 0), -(11, 'https://grep.app/', 'img/links/favicons/favicon-58035.png', 1, 0), -(18, 'https://infosec.exchange/@plexsheep/', 'img/links/favicons/favicon-58703.png', 1, 1), +(19, 'https://cscg.de/', 'img/links/favicons/favicon-12398.png', 1, 0), +(10, 'https://european-alternatives.eu/', 'img/links/favicons/favicon-36105.png', 1, 0), +(11, 'https://grep.app/', 'img/links/favicons/favicon-43495.png', 1, 0), +(18, 'https://infosec.exchange/@plexsheep/', 'img/links/favicons/favicon-46734.png', 1, 1), (17, 'https://teslskdhglkjsahglkjdhflahgdlkjshgalskdhglkjsahglkjdsah.de', '', 0, 0); -- -------------------------------------------------------- @@ -541,7 +546,8 @@ INSERT INTO `start_searchable` (`id`, `title_de`, `title_en`, `subtitle_de`, `su (10, 'Europäische Alternativen', 'european alternatives', '', '', 'Hilft bei der Suche nach europäischen Alternativen für digitale Dienstleistungen und Produkte, wie Cloud-Dienste und SaaS-Produkte.', 'Helps you find European alternatives for digital service and products, like cloud services and SaaS products.', '2023-06-05', '/links#european alternatives', 1), (11, 'grep.app', 'grep.app', '', '', 'Suche über eine halbe Million Git-Repos', 'Search across a half million git repos', '2023-06-05', '/links#grep.app', 1), (17, 'unavailable test', 'unavailable test', '', '', 'Beschreibung DE', 'Description EN', NULL, '/links#unavailable test', 1), -(18, 'Mastodon', 'Mastodon', 'Dezentralisiertes social Media', 'decentralized social media', 'Mastodon ist ein Microblogging Dienst im Fediverse. Ähnlich wie Twitter, aber besser.', 'Mastodon is a microblogging service on the fediverse, think twitter but better and more free.', '2023-07-15', '/links#Mastodon', 1); +(18, 'Mastodon', 'Mastodon', 'Dezentralisiertes social Media', 'decentralized social media', 'Mastodon ist ein Microblogging Dienst im Fediverse. Ähnlich wie Twitter, aber besser.', 'Mastodon is a microblogging service on the fediverse, think twitter but better and more free.', '2023-07-15', '/links#Mastodon', 1), +(19, 'Cyber Security Challenge Deutschland', 'Cyber Security Challenge Germany', 'Nationaler IT-Sicherheitswettbewerb', 'National IT-Security Competition', 'Wettbewerb für Jugendliche (bis zu 25 Jahren) im Bereich IT-Sicherheit', 'Competition for youth (up to 25 years old) in Cybersecurity', '2023-09-27', '/links#Cyber Security Challenge Germany', 1); -- -------------------------------------------------------- @@ -580,7 +586,8 @@ INSERT INTO `start_searchable_keywords` (`id`, `searchable_id`, `keyword_id`) VA (21, 11, 8), (34, 17, 3), (35, 18, 9), -(36, 18, 10); +(36, 18, 10), +(37, 19, 11); -- -------------------------------------------------------- @@ -775,7 +782,7 @@ ALTER TABLE `blog_category` -- AUTO_INCREMENT für Tabelle `django_admin_log` -- ALTER TABLE `django_admin_log` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=78; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=80; -- -- AUTO_INCREMENT für Tabelle `django_content_type` @@ -793,19 +800,19 @@ ALTER TABLE `django_migrations` -- AUTO_INCREMENT für Tabelle `start_keyword` -- ALTER TABLE `start_keyword` - MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=11; + MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=12; -- -- AUTO_INCREMENT für Tabelle `start_searchable` -- ALTER TABLE `start_searchable` - MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=19; + MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=20; -- -- AUTO_INCREMENT für Tabelle `start_searchable_keywords` -- ALTER TABLE `start_searchable_keywords` - MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=37; + MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=38; -- -- Constraints der exportierten Tabellen diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 2919ae0..628aaa4 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -8,4 +8,5 @@ RUN apt update && apt install -y gettext && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install -r requirements.txt COPY . /app/ -RUN python /app/manage.py collectstatic --noinput +# RUN ls -la /app/ ; return 1 +# RUN python /app/manage.py collectstatic --noinput diff --git a/gawa/start/templates/nav.html b/gawa/start/templates/nav.html index 398c1d5..fec8528 100644 --- a/gawa/start/templates/nav.html +++ b/gawa/start/templates/nav.html @@ -38,7 +38,7 @@ Debug
    -
  • DB
    • +
  • DB
  • Admin
  • Something else here
    • diff --git a/startup.sh b/startup.sh index 5ae4284..c4084e9 100755 --- a/startup.sh +++ b/startup.sh @@ -1,5 +1,4 @@ #!/bin/bash -mkdir -p /db/data docker compose down docker compose build docker compose up -d --remove-orphans