From 0d06f1c08527c9ee9a1d370a48009017fc87b25b Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:01:53 -0600 Subject: [PATCH 1/8] unsure --- content/index.md | 3 +++ readme.md | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100755 content/index.md create mode 100644 readme.md diff --git a/content/index.md b/content/index.md new file mode 100755 index 0000000..69a3a9f --- /dev/null +++ b/content/index.md @@ -0,0 +1,3 @@ +# This is a test +and this is p +*italics* diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..54320a3 --- /dev/null +++ b/readme.md @@ -0,0 +1,22 @@ +# Architecture +/app +> containts all of the files to build and run the docker container.Docker containter runs the application +/content +> contains all of the publicly accessible files + templates + notes + index + ... +compose # compose file to mount content to app +build.sh #optional file to build the app +.env # enviroment var files for location of existing public directory. will depricate + + +# Dockerfile +> builds the flask application and sets it to run. + - runs the site + +# app + - clones the public repo (from env var url) + - finds public notes and moves to content vault + - exposes webhook to update vault and public notes -- 2.49.1 From 24b6b700be369f1b92f2dc7235b9da51a41b66a3 Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:02:28 -0600 Subject: [PATCH 2/8] removed dir --- public_vault/Cyber-Crime.md | 75 ----------------------------- public_vault/Website Tutorial.md | 82 -------------------------------- public_vault/test.md | 7 --- 3 files changed, 164 deletions(-) delete mode 100644 public_vault/Cyber-Crime.md delete mode 100644 public_vault/Website Tutorial.md delete mode 100644 public_vault/test.md diff --git a/public_vault/Cyber-Crime.md b/public_vault/Cyber-Crime.md deleted file mode 100644 index 787d479..0000000 --- a/public_vault/Cyber-Crime.md +++ /dev/null @@ -1,75 +0,0 @@ -#public -- **Cyber Crime**: Use computer/digital device to further illegal ends -> "nothings black and white in what we do, everything's got some gray" -## Types of crime - - **Crimes Against People**: A digital crime where the victim is a person - - **Crimes Against Property**: A digital crime that damages, or illegally interacts with property - - **Crimes Against Government**: A digital crime to undermine the efficacy of a government -> Life is not Black and White, Consider what the greatest impact is - -| Crime | category | -| --- | --- | -| Harrassement | People | -| Stalking | People | -| Credit Card fraud | People | -| Id theft | People | -| DOS attack | Property | -| Hacking | Property | -| Vandalism | Property | -| Cyber Warfare | Government| -| Cyber Terrorism | Government| - - > Online Harassment is a growing field, stalking, bullying, doxing, etc. - -> Modern wars be started with infrastructure hacks, Power grid hacks of Ukraine, Iran, Etc. - -### Cyber-stalking and bullying - - **Cyber Bulling**: People attacking reputation and self esteem of other people trough online means like social media campaigns. - - **Cyber Stalking**: Stalking someone through their online footprint. Often to find information with which to exploit the victim. -> Typically older person stalking a younger person. As opposed to bullying, which is usually across the same age -### Cyber Terrorism - - **Cyber Terrorism**: Politically motivated attacks on major infrastructure Money can be a factor, but usually the political is the primary motivation - - Instill fear in a society to elicit some reaction - - financial/reputation gain - - revenge - - etc. - -## Examples -Stux-Net -Nation-state attacks on power grids before Wars - -- **Sneaker Net**: Moving information across barriers physicality -> proving an attack is one of the hardest questions to answer -# U.S. National cyber strategy - - **U.S. National cyber strategy**: anually updated policy document from the white house detailing the national cyber objectives - -> it has been similar last few years - - - promote American people - - promoting American prosperity - - preserve peace through strength - - deterrent - - advanced American cyber influence - - strong alliances - - promote international policies - - Shaping adversary behavior - - regulatory environment - - Federal government security - - criticial infrastructure security - - cyber skills workforce gap - - - - - - - - - - - - - - - - diff --git a/public_vault/Website Tutorial.md b/public_vault/Website Tutorial.md deleted file mode 100644 index e607044..0000000 --- a/public_vault/Website Tutorial.md +++ /dev/null @@ -1,82 +0,0 @@ ---- -tags: - - public - - notes - - tutorial - - code - - project - - blog ---- -# So you need a website -## Overview -1. How do websites work -2. 3 things that you need -3. What are your options - 1. Premium - 2. Custom - 3. DIY - 1. Registering a domain - 1. What is DNS - 2. Picking a domain - 3. setting up a registrar - 2. Building a frontend - 1. Chat GPT - 2. DeepSite - 3. DIY options - 4. UX and frontend resources - 3. Setting up GH pages - 1. GH account - 2. Set up New Repo - 3. Importing Code - 4. Setting the DNS -## how do websites work -There are 3 main elements of the internet: your computer, the website's code, and the path between the two. -You can download [this page]() and open it in your computer. Notice how your browser's address doesn't say "Https://%url%" but instead shows a file location on your own machine. -The internet is the same phenomenon, but between multiple computers. URL, (the technical name for a link, or website address) simply stands for Universal Resource Locator and is just a way of telling your computer how to access a file on someone else's computer.* -There are lots of complicated standards for how computers actually talk to each other. The most relevant here is DNS, which stands for Domain Name System. It is how we assign internet-connected computers (called servers) with human readable names. There are special DNS servers which are responsible for telling your computer where in the world a specific website is stored. -A URL, a frontend, and server to host it are all that you need to create a website. I will explain how to simply and affordably (or even for free) set up each of these elements. - - *url's can end in [.pdf](example), [.jpg](example), or other file extensions. Just like files on your computer.* -## What do you need -### A URL -Simply a link that is going to point to your website. You can buy one from a domain registrar and configure it in just a few minutes. -### A Website file to display -This is what people will see when they visit your website. -### A computer to display it on -There are myriad ways to accomplish this from renting a server from someone, to putting on in your house, to taking advantage of already free web hosting tools. I'm going to show you how to use GitHub's* free hosting service - -*GitHub is owned by Microsoft and is the largest code distribution and hosting service. Most companies and developers rely on it's services daily.* - -## Getting A Domain -The process of registering a domain takes only a few minutes, and a couple of steps. - -There are a number of websites that control who has access to websites, and which servers they point to. They are all basically the same. I've picked out [namecheap](https://namecheap.com) for this tutorial. - -To register a domain just head over to their site, find a domain that you want, and purchase it. Watch out for these: -1. First year prices are often discounted. Watch for a renewal rate. -2. Save your password somewhere. You will hopefully have this website for a long time, and you may have someone else manage it for you eventually. -3. Marketable domains are often short and easy to spell. Imagine verbally telling someone how to visit the website. - -Make sure to verify your email and save your login information, as we will be needing to log back in shortly. - -### Building a frontend - - - - - - - - - - - - - - - - - - - - diff --git a/public_vault/test.md b/public_vault/test.md deleted file mode 100644 index 1621b48..0000000 --- a/public_vault/test.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -public: "true" -tags: - - public ---- -# This is a test -and this is p -- 2.49.1 From 8acb06764a164cddaf00990ef15a70fb23f55160 Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:05:00 -0600 Subject: [PATCH 3/8] removed public vault dir --- public_vault_builder/Dockerfile | 14 -------------- public_vault_builder/build.py | 25 ------------------------- public_vault_builder/requirements.txt | 2 -- 3 files changed, 41 deletions(-) delete mode 100644 public_vault_builder/Dockerfile delete mode 100644 public_vault_builder/build.py delete mode 100644 public_vault_builder/requirements.txt diff --git a/public_vault_builder/Dockerfile b/public_vault_builder/Dockerfile deleted file mode 100644 index 329e7bd..0000000 --- a/public_vault_builder/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM python:3.12-slim - - -run mkdir /public-vault - -WORKDIR /build - -COPY requirements.txt . - -RUN pip3 install -r requirements.txt - -COPY . . - -CMD ["python", "build.py"] diff --git a/public_vault_builder/build.py b/public_vault_builder/build.py deleted file mode 100644 index e1be12b..0000000 --- a/public_vault_builder/build.py +++ /dev/null @@ -1,25 +0,0 @@ -from obsidian_parser import Vault -import shutil -from git import Repo - - -# repo_url = "https://gitlab.com/username/my-vault.git" -dest = "/content" -src = "Personal-Wiki" -# Load a vault -vault = Vault(src) - -if vault: - print ("found vault") -else: - print("could not find vault") - -# Find notes by exact name -note = vault.get_note("test") - -# Findd all public notes -publicNotes = vault.get_notes_with_tag("public") - -for note in publicNotes: - print(note.title) - shutil.copy2(f"{note.path}", dest) diff --git a/public_vault_builder/requirements.txt b/public_vault_builder/requirements.txt deleted file mode 100644 index b37b36e..0000000 --- a/public_vault_builder/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -obsidianmd-parser -GitPython -- 2.49.1 From 994a96a0beabb0f0019deb5375cbbb9b5276e2fa Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:07:05 -0600 Subject: [PATCH 4/8] updated requirements from deleted build.py --- app/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/requirements.txt b/app/requirements.txt index ad45c3c..8a3f15c 100755 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,2 +1,4 @@ flask markdown +obsidianmd-parser +GitPython -- 2.49.1 From 58ba0b1444a912f0994718dca41b46922e736b86 Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:07:56 -0600 Subject: [PATCH 5/8] added gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7de00e0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +app/__pychache__ -- 2.49.1 From f8a791a4fe8520ca1e2ba5f63f09f5cf7875fc1d Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:08:22 -0600 Subject: [PATCH 6/8] changed to __init__.py --- app/{___init___.py => __init__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/{___init___.py => __init__.py} (100%) diff --git a/app/___init___.py b/app/__init__.py similarity index 100% rename from app/___init___.py rename to app/__init__.py -- 2.49.1 From e07c75d85707dc532141f08fc3986a5555d33021 Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:09:55 -0600 Subject: [PATCH 7/8] updated compose and moved dockerfile --- app/Dockerfile => Dockerfile | 0 compose.yml | 6 ------ 2 files changed, 6 deletions(-) rename app/Dockerfile => Dockerfile (100%) diff --git a/app/Dockerfile b/Dockerfile similarity index 100% rename from app/Dockerfile rename to Dockerfile diff --git a/compose.yml b/compose.yml index 6841c41..c496596 100755 --- a/compose.yml +++ b/compose.yml @@ -1,15 +1,9 @@ services: app: build: - context: app args: - DEBUG_MODE=1 ports: - '80:80' volumes: - ./content:/content - # public_vault_builder: - # build: - # context: public_vault_builder - # volumes: - # - ./public_vault:/content -- 2.49.1 From f8725658a56f01905db13b53c669d964c504336c Mon Sep 17 00:00:00 2001 From: venus Date: Wed, 4 Mar 2026 16:22:41 -0600 Subject: [PATCH 8/8] docker works --- Dockerfile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 821361c..b9d17e6 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,15 @@ -FROM python:3.10-slim AS builder +FROM python:3.14-slim ARG DEBUG_MODE=0 ENV FLASK_DEBUG=$DEBUG_MODE ENV FLASK_APP=app +RUN mkdir /app +COPY app/requirements.txt /app +RUN pip3 install -r /app/requirements.txt +COPY app /app - -COPY requirements.txt - -RUN pip3 install -r requirements.txt - -COPY . . - - -EXPOSE 443 ENTRYPOINT ["flask"] -# CMD [ "run", "--host=0.0.0.0", "--port=80"] -CMD ["--app", "app", "run", "--host=0.0.0.0", "--port=443"] +CMD ["--app", "app", "run", "--host=0.0.0.0", "--port=80"] -- 2.49.1