Small typo fix to thunderbird

5 files changed, 16 insertions, 16 deletions

diff --git a/docs/desktop/thunderbird.md b/docs/desktop/thunderbird.md
index 222f540..469b618 100644
--- a/docs/desktop/thunderbird.md
+++ b/docs/desktop/thunderbird.md
@@ -8,7 +8,7 @@ Unfortunately, I'm American, so here's how I change it.
 1. Go to settings in Thunderbird.
 2. Change Date and Time Formatting to Regional settings locale.
 3. Go to config editor at the bottom of general settings.
-4. Create new config string `intl.date_time.pattern_overrite.time_short`.
+4. Create new config string `intl.date_time.pattern_override.time_short`.
 5. Format follows [datetime](https://unicode-org.github.io/icu/userguide/format_parse/datetime/) format, I use hh:mmaaaa.
 6. Restart Thunderbird.
 
diff --git a/site/desktop/thunderbird/index.html b/site/desktop/thunderbird/index.html
index 1ac29df..4f7c4b6 100644
--- a/site/desktop/thunderbird/index.html
+++ b/site/desktop/thunderbird/index.html
@@ -742,7 +742,7 @@ Unfortunately, I'm American, so here's how I change it.</p>
 <li>Go to settings in Thunderbird.</li>
 <li>Change Date and Time Formatting to Regional settings locale.</li>
 <li>Go to config editor at the bottom of general settings.</li>
-<li>Create new config string <code>intl.date_time.pattern_overrite.time_short</code>.</li>
+<li>Create new config string <code>intl.date_time.pattern_override.time_short</code>.</li>
 <li>Format follows <a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/">datetime</a> format, I use hh:mmaaaa.</li>
 <li>Restart Thunderbird.</li>
 </ol>
diff --git a/site/search/search_index.json b/site/search/search_index.json
index 5e74aef..05d20d4 100644
--- a/site/search/search_index.json
+++ b/site/search/search_index.json
@@ -1 +1 @@
-{"config":{"lang":["en"],"separator":"[\\s\\-]+","pipeline":["stopWordFilter"]},"docs":[{"location":"","title":"Welcome to Joshua's Wiki","text":"<p>This is where I will be putting my stuff on how to configure things</p>"},{"location":"about/","title":"About this wiki","text":"<p>This is where I will be putting my stuff on how to configure things as well as some other personal references.</p>"},{"location":"desktop/desktop/","title":"Desktop Wiki","text":"<p>This page describes several useful tips and configurations that I've used.</p> <p>Thunderbird</p> <p>Syncthing on Artix</p>"},{"location":"desktop/syncthing/","title":"Syncthing using Runit and Artix Linux","text":"<p>The default Artix Linux syncthing script is broken, here is a corrected version that works:</p> <pre><code>#!/bin/sh\nexport USER=\"joshua\"\nexport HOME=\"/home/joshua\"\n\ngroups=\"$(id -Gn \"$USER\" | tr ' ' ':')\"\n\nexec 2&gt;&amp;1\nexec chpst -u \"$USER:groups\" syncthing -logflags 0\n</code></pre> <p>References:</p> <p>Void Linux Per User Services</p>"},{"location":"desktop/thunderbird/","title":"Thunderbird","text":""},{"location":"desktop/thunderbird/#setting-dateformat","title":"Setting dateformat","text":"<p>Usually the date format is not in AM/PM. Unfortunately, I'm American, so here's how I change it.</p> <ol> <li>Go to settings in Thunderbird.</li> <li>Change Date and Time Formatting to Regional settings locale.</li> <li>Go to config editor at the bottom of general settings.</li> <li>Create new config string <code>intl.date_time.pattern_overrite.time_short</code>.</li> <li>Format follows datetime format, I use hh:mmaaaa.</li> <li>Restart Thunderbird.</li> </ol> <p>References:</p> <p>Linux Mint formum detailing these instructions</p> <p>Datetime Reference</p> <p>Mozilla Article on customizing formats</p>"},{"location":"food/curry/","title":"Curry Recipe","text":"<p>Serves four people with leftovers for the week.</p>"},{"location":"food/curry/#ingredients","title":"Ingredients","text":"<ul> <li>2-3 small carrots or 1.5 large carrots</li> <li>Bag of white mushroom thinly sliced</li> <li>1 hobok or zucchini cut into 1 cm cubes</li> <li>4 Medium potatoes cut into 1 cm cubes</li> <li>1.5 Vermont curry boxes</li> <li>1 big onion diced</li> <li>(Optional) Meat e.g. sausage</li> <li>(Optional) Cooking wine</li> </ul>"},{"location":"food/curry/#preparation","title":"Preparation","text":"<ul> <li>Dice the onion</li> <li>Dice the potatoes into 1cm cubes</li> <li>Dice the hobok/zucchini into 1cm cubes</li> <li>Put the potatoes in water to remove starch</li> </ul>"},{"location":"food/curry/#cooking","title":"Cooking","text":"<ul> <li>Add 2 tablespoons of oil to the pot</li> <li>Add carrot</li> <li>Add potato when carrots are cooked</li> <li>Add onion</li> <li>Add curry bricks</li> <li>Add wine</li> <li>Add water and wait for it to boil</li> <li>Add meat e.g. sausage (optional)</li> <li>Add Mushroom &amp; hobok / zucchini</li> </ul>"},{"location":"food/spicy-shrimp/","title":"Spicy Shrimp","text":""},{"location":"food/spicy-shrimp/#ingredients","title":"Ingredients","text":"<ul> <li>Shrimp half pound</li> <li>1 onion</li> <li>3 cloves of garlic</li> <li>Green onion</li> <li>Pepper paste (gochujang)</li> <li>Butter (?? Quantity)</li> <li>Sugar</li> <li>MSG thing (?? Quantity)</li> <li>1.5 spoonfulls cornstarch</li> <li>Sesame oil</li> </ul>"},{"location":"food/spicy-shrimp/#preparation","title":"Preparation","text":"<ul> <li>Salt the shrimp</li> </ul>"},{"location":"food/spicy-shrimp/#cooking","title":"Cooking","text":"<ul> <li>Add onion</li> <li>Add garlic</li> <li>Add shrimp</li> <li>Add cooking wine</li> <li>Add pepper paste</li> <li>Add water</li> <li>Add butter</li> <li>Add MSG thing</li> <li>Add sugar to taste</li> <li>Add green onion</li> <li>In a separate bowl, add cornstarch</li> <li>Add water to the separate bowl</li> <li>Combine the cornstarch bowl with the sauce bowl</li> <li>Add seasame oil to the mix</li> </ul>"},{"location":"food/tempora/","title":"Tempora Recipe","text":""},{"location":"food/tempora/#ingredients","title":"Ingredients","text":"<ul> <li>Tempora from Korean market</li> <li>1 spoonful diced garlic</li> <li>Pepper Powder</li> <li>Half an onion</li> <li>Green Onion</li> <li>Soy sauce</li> <li>Sugar</li> </ul>"},{"location":"food/tempora/#cooking","title":"Cooking","text":"<ul> <li>Add the garlic</li> <li>Stir for a bit</li> <li>Add tiny amount of pepper powder</li> <li>Add tempora</li> <li>Add onion</li> <li>Add soy sauce and sugar to taste</li> <li>Stir at low heat for a long time</li> <li>Add green onion as a garnish</li> </ul>"},{"location":"phone/lineageos/","title":"Android Auto with microG and Lineage OS","text":"<p>These instructions are almost identical to Braga2's instructions with a single important change that is emphasized.</p> <p>References:</p> <p>Braga2's Instructions</p> <p>Google App Stub</p> <p>Oneplus build example</p> <p>Building LineageOS for Panther</p> <p>LineageOS with MicroG</p> <p>Docker to build LineageOS</p> <p>Android Auto Build</p>"},{"location":"server/cgit/","title":"Cgit with gitolite and caddy","text":""},{"location":"server/cgit/#setup","title":"Setup","text":"<p>Install dependencies.</p> <pre><code># apt install cgit python-is-python3 python3-pygments python3-markdown docutils-common groff perl\n</code></pre> <p>Make a git user.</p> <pre><code>sudo adduser --system --shell /bin/bash --group --disabled-password --home /home/git git\n</code></pre> <p>Allow ssh passwordless login.</p> <pre><code>usermod -p '*' username\n</code></pre>"},{"location":"server/cgit/#gitolite","title":"Gitolite","text":"<p>Install the gitolite package from the repository directly.</p>"},{"location":"server/cgit/#configuration-with-cgit","title":"Configuration with cgit","text":"<p>Configuration of gitolite is done by modifying <code>$HOME/.gitolite.rc</code>.</p> <p>To work correctly with cgit, gitweb and cgit configuration options need to work with gitolite.</p> <p>Change:</p> <pre><code>GIT_CONFIG_KEYS  =&gt;  '',\n</code></pre> <p>To:</p> <pre><code>GIT_CONFIG_KEYS  =&gt;  '.*',\n</code></pre> <p>To have permissions work correctly,</p> <p>Change:</p> <pre><code>UMASK  =&gt;  0077,\n</code></pre> <p>To:</p> <pre><code>UMASK  =&gt;  0027,\n</code></pre> <p>In the <code>ENABLE</code> field, add gitweb and cgit to the list.</p>"},{"location":"server/cgit/#usage","title":"Usage","text":"<p>Detailed usage of gitolite can be found here</p>"},{"location":"server/cgit/#repository-ignore","title":"Repository ignore","text":"<p>After cgit is configured, cgit can be told to ignore a repo with this syntax.</p> <pre><code>repo gitolite-admin\n    config cgit.ignore=1\n</code></pre>"},{"location":"server/cgit/#adding-hooks-to-gitolite","title":"Adding Hooks to gitolite","text":"<p>This page details how to add hooks to your repositories.</p> <p>Example hook that updates a website every git push. Make sure this directory is owned by git.</p> <pre><code>#!/bin/sh\nGIT_WORK_TREE=/desired/website/directory git checkout -f\n</code></pre>"},{"location":"server/cgit/#cgit","title":"Cgit","text":""},{"location":"server/cgit/#running-cgit-with-caddy","title":"Running cgit with caddy","text":"<p>Install the fcgiwrap package.</p> <p>Create a systemd service that wraps cgit with FastCGI.</p> <pre><code># systemctl edit --full --force cgit.service\n</code></pre> <pre><code>[Unit]\nDescription=CGI web interface to the Git SCM\nAfter=network.target\n\n[Service]\nType=exec\nExecStart=fcgiwrap -f -p \"/usr/lib/cgit/cgit.cgi\" -s tcp:127.0.0.1:8999\n\n[Install]\nWantedBy=multi-user.target\n</code></pre> <pre><code># systemctl start cgit\n</code></pre> <p>Add cgit configuration to caddy.</p> <pre><code>git.joshuayun.com {\n        handle_path /cgit-css/* {\n                root * /usr/share/cgit/\n                file_server\n        }\n\n        handle {\n                reverse_proxy localhost:8999 {\n                        transport fastcgi {\n                                env DOCUMENT_ROOT /usr/lib/cgit/\n                                env SCRIPT_FILENAME /usr/lib/cgit/cgit.cgi\n                        }\n                }\n        }\n}\n</code></pre>"},{"location":"server/cgit/#cgit-configuration","title":"Cgit configuration","text":"<p>More detailed documentation can be found on the cgitrc(5) manual.</p> <p>enable-git-config is used to allow for gitweb.* configurations in gitolite, e.g. description, owner.</p> <pre><code>enable-git-config=1\n</code></pre> <p>project-list sets where cgit looks for projects, this list is the one updated by gitolite</p> <pre><code>project-list=/home/git/projects.list\n</code></pre> <p>scan-path sets where the actual git repositories live</p> <pre><code>scan-path=/home/git/repositories\n</code></pre>"},{"location":"server/cgit/#references","title":"References","text":"<p>SixFoisNeuf Used this blog to run cgit using fcgiwrap rather than a caddy plugin. The entire cgit with caddy section was using his work.</p> <p>Mateja Maric Used this blog to help configure cgitrc, gitolite.rc</p> <p>Luke Hsiao Used the git user creation command from this blog.</p> <p>Omar Polo (yumh) Used this blog to help configure cgitrc for hidden repos.</p> <p>Bryan Brattlof Not much used here, kept as reference.</p>"},{"location":"server/ddns/","title":"DDNS Setup","text":""},{"location":"server/ddns/#porkbun-api","title":"Porkbun API","text":"<p>Follow this porkbun guide on enabling the api for your domain.</p>"},{"location":"server/ddns/#ddns-updater","title":"ddns-updater","text":"<p>ddns-updater is the program used to update Porkbun's A record of your domain.</p>"},{"location":"server/ddns/#docker-install","title":"Docker install","text":"<p>Install the docker package from official docker repositories.</p>"},{"location":"server/ddns/#setup","title":"Setup","text":"<p>Create a directory with config.json inside, and make sure that its owner has a uid of 1000.</p> <pre><code>mkdir data\ntouch data/config.json\n# Owned by user ID of Docker container (1000)\nchown -R 1000 data\n# all access (for creating json database file data/updates.json)\nchmod 700 data\n# read access only\nchmod 400 data/config.json\n</code></pre> <p>Configuration for porkbun in config.json</p> <pre><code>{\n  \"settings\": [\n    {\n      \"provider\": \"porkbun\",\n      \"domain\": \"domain.com\",\n      \"host\": \"@\",\n      \"api_key\": \"PORKBUN SECRET KEY\",\n      \"secret_api_key\": \"PORKBUN API KEY\",\n      \"ip_version\": \"ipv4\"\n    }\n  ]\n}\n</code></pre> <p>Optional <code>\"ttl\"</code> paramter specifing A record TTL not included.</p>"},{"location":"server/ddns/#usage","title":"Usage","text":"<pre><code>docker run -d -p 8000:8000/tcp -v \"$(pwd)\"/data:/updater/data qmcgaw/ddns-updater\n</code></pre> <p>This will start a docker container that will start updating the DNS records. Status updates can be seen in a web server by going to localhost:8000.</p>"},{"location":"server/server/","title":"Homelab Server Setup","text":"<p>This page describes how I setup my personal webserver</p> <p>I'm hosting a website, wiki, caldav using Radicale, git using cgit and Gitolite, and webdav support</p>"},{"location":"server/server/#linux-distribution-used","title":"Linux Distribution Used","text":"<p>Debian 12 Bookworm.</p> <p>Update the system.</p> <pre><code># apt update\n# apt upgrade\n</code></pre>"},{"location":"server/server/#ssh","title":"SSH","text":"<p>Generate ssh keys</p> <pre><code>ssh-keygen -t [keytype]\n</code></pre> <p>Add ssh keys to <code>~/.ssh/authorized_keys</code></p> <pre><code>ssh-copy-id -i /path/to/pubkey [user@]machine\n</code></pre>"},{"location":"server/server/#optional-security-enhancements","title":"Optional security enhancements","text":"<p>Change the port in <code>/etc/sshd_config</code> to a nonstandard port to harden security.</p> <pre><code>Port 1234\n</code></pre> <p>Disable password login in <code>/etc/sshd_config/</code></p> <pre><code>PubkeyAuthentication yes\nChallengeResponseAuthentication no\nPasswordAuthentication no\nKbdInteractiveAuthentication no\nUsePAM no\n</code></pre> <p>Disable XForwarding</p> <pre><code>X11Forwarding no\n</code></pre> <p>Disable remote root login</p> <pre><code>PermitRootLogin no\n</code></pre> <p>Disable root account</p> <pre><code>$ sudo chsh -s /sbin/nologin root\n</code></pre>"},{"location":"server/server/#ddns","title":"DDNS","text":"<p>Setup Dyanmic DNS (ddns) with Porkbun and ddns-updater.</p>"},{"location":"server/server/#caddy","title":"Caddy","text":"<p>Install the Caddy package from Caddy directly.</p>"},{"location":"server/server/#cgit-gitolite","title":"Cgit &amp; gitolite","text":"<p>Setup cgit with gitolite and caddy.</p>"},{"location":"server/server/#radicale","title":"Radicale","text":"<p>Install the Radicale package.</p> <p>Start the Radicale service.</p> <pre><code>systemctl enable radicale.service\nsystemctl start radicale.service\n</code></pre> <p>Generate secure passwords using htpasswd.</p> <pre><code># Create a new htpasswd file with the user \"user1\"\n$ htpasswd -c /path/to/users user1\nNew password:\nRe-type new password:\n# Add another user\n$ htpasswd /path/to/users user2\nNew password:\nRe-type new password:\n</code></pre> <p>Edit configuration to add users</p> <pre><code>[auth]\ntype = htpasswd\nhtpasswd_filename = /path/to/users\n# encryption method used in the htpasswd file\nhtpasswd_encryption = md5\n</code></pre> <p>Add configuration to caddy.</p> <pre><code>caldav.joshuayun.com {\n    handle_path /* {\n        reverse_proxy localhost:5232 {\n        header_up X-Script-Name /radicale\n        }\n    }\n    handle_path /radicale/* {\n        reverse_proxy localhost:5232 {\n            header_up X-Script-Name /radicale\n        }\n    }\n}\n</code></pre>"},{"location":"server/server/#webdav","title":"Webdav","text":"<p>Add the Webdav module to Caddy.</p> <pre><code>sudo caddy add-package github.com/mholt/caddy-webdav\nsudo systemctl restart caddy\n</code></pre> <p>Add Webdav to the Caddy configuration</p> <p>Example configuration with protected file browsing, see the github for more configurations.</p> <pre><code>webdav.joshuayun.com {\n    @get method GET\n    root * WEBDAV_PATH\n    route {\n        basicauth {\n            joshua CADDY_HASH\n        }\n        file_server @get browse\n        webdav\n    }\n}\n</code></pre> <p>To generate the hash:</p> <pre><code>caddy hash-password\n</code></pre>"},{"location":"server/syncthing/","title":"Syncthing Setup","text":"<p>I am currently using syncthing for my music to be synced across devices.</p>"},{"location":"server/syncthing/#installation","title":"Installation","text":"<p>Install the Syncthing package from upstream repositories.</p>"},{"location":"server/syncthing/#reverse-proxy-setup-ref","title":"Reverse proxy setup [Ref]","text":"<p>Example syncthing reverse proxy setup. </p> <pre><code>sync.joshuayun.com {\n        handle_path /* {\n                reverse_proxy http://localhost:8384 {\n                        header_up Host {upstream_hostport}\n                }\n        }\n}\n</code></pre> <p>Optional: Add a htpasswd to block unauthorized access to the syncthing.</p>"},{"location":"server/syncthing/#syncthing-system-service-ref","title":"Syncthing system service [Ref]","text":"<p>Enable the syncthing user service.</p> <pre><code>systemctl enable syncthing@myuser.service\nsystemctl start syncthing@myuser.service\n</code></pre>"},{"location":"server/syncthing/#syncthing-configuration","title":"Syncthing configuration","text":"<p>Done all through the gui. It is recommended to setup a user login, especially if you are making a syncthing that is exposed to the open internet.</p>"}]}
\ No newline at end of file
+{"config":{"lang":["en"],"separator":"[\\s\\-]+","pipeline":["stopWordFilter"]},"docs":[{"location":"","title":"Welcome to Joshua's Wiki","text":"<p>This is where I will be putting my stuff on how to configure things</p>"},{"location":"about/","title":"About this wiki","text":"<p>This is where I will be putting my stuff on how to configure things as well as some other personal references.</p>"},{"location":"desktop/desktop/","title":"Desktop Wiki","text":"<p>This page describes several useful tips and configurations that I've used.</p> <p>Thunderbird</p> <p>Syncthing on Artix</p>"},{"location":"desktop/syncthing/","title":"Syncthing using Runit and Artix Linux","text":"<p>The default Artix Linux syncthing script is broken, here is a corrected version that works:</p> <pre><code>#!/bin/sh\nexport USER=\"joshua\"\nexport HOME=\"/home/joshua\"\n\ngroups=\"$(id -Gn \"$USER\" | tr ' ' ':')\"\n\nexec 2&gt;&amp;1\nexec chpst -u \"$USER:groups\" syncthing -logflags 0\n</code></pre> <p>References:</p> <p>Void Linux Per User Services</p>"},{"location":"desktop/thunderbird/","title":"Thunderbird","text":""},{"location":"desktop/thunderbird/#setting-dateformat","title":"Setting dateformat","text":"<p>Usually the date format is not in AM/PM. Unfortunately, I'm American, so here's how I change it.</p> <ol> <li>Go to settings in Thunderbird.</li> <li>Change Date and Time Formatting to Regional settings locale.</li> <li>Go to config editor at the bottom of general settings.</li> <li>Create new config string <code>intl.date_time.pattern_override.time_short</code>.</li> <li>Format follows datetime format, I use hh:mmaaaa.</li> <li>Restart Thunderbird.</li> </ol> <p>References:</p> <p>Linux Mint formum detailing these instructions</p> <p>Datetime Reference</p> <p>Mozilla Article on customizing formats</p>"},{"location":"food/curry/","title":"Curry Recipe","text":"<p>Serves four people with leftovers for the week.</p>"},{"location":"food/curry/#ingredients","title":"Ingredients","text":"<ul> <li>2-3 small carrots or 1.5 large carrots</li> <li>Bag of white mushroom thinly sliced</li> <li>1 hobok or zucchini cut into 1 cm cubes</li> <li>4 Medium potatoes cut into 1 cm cubes</li> <li>1.5 Vermont curry boxes</li> <li>1 big onion diced</li> <li>(Optional) Meat e.g. sausage</li> <li>(Optional) Cooking wine</li> </ul>"},{"location":"food/curry/#preparation","title":"Preparation","text":"<ul> <li>Dice the onion</li> <li>Dice the potatoes into 1cm cubes</li> <li>Dice the hobok/zucchini into 1cm cubes</li> <li>Put the potatoes in water to remove starch</li> </ul>"},{"location":"food/curry/#cooking","title":"Cooking","text":"<ul> <li>Add 2 tablespoons of oil to the pot</li> <li>Add carrot</li> <li>Add potato when carrots are cooked</li> <li>Add onion</li> <li>Add curry bricks</li> <li>Add wine</li> <li>Add water and wait for it to boil</li> <li>Add meat e.g. sausage (optional)</li> <li>Add Mushroom &amp; hobok / zucchini</li> </ul>"},{"location":"food/spicy-shrimp/","title":"Spicy Shrimp","text":""},{"location":"food/spicy-shrimp/#ingredients","title":"Ingredients","text":"<ul> <li>Shrimp half pound</li> <li>1 onion</li> <li>3 cloves of garlic</li> <li>Green onion</li> <li>Pepper paste (gochujang)</li> <li>Butter (?? Quantity)</li> <li>Sugar</li> <li>MSG thing (?? Quantity)</li> <li>1.5 spoonfulls cornstarch</li> <li>Sesame oil</li> </ul>"},{"location":"food/spicy-shrimp/#preparation","title":"Preparation","text":"<ul> <li>Salt the shrimp</li> </ul>"},{"location":"food/spicy-shrimp/#cooking","title":"Cooking","text":"<ul> <li>Add onion</li> <li>Add garlic</li> <li>Add shrimp</li> <li>Add cooking wine</li> <li>Add pepper paste</li> <li>Add water</li> <li>Add butter</li> <li>Add MSG thing</li> <li>Add sugar to taste</li> <li>Add green onion</li> <li>In a separate bowl, add cornstarch</li> <li>Add water to the separate bowl</li> <li>Combine the cornstarch bowl with the sauce bowl</li> <li>Add seasame oil to the mix</li> </ul>"},{"location":"food/tempora/","title":"Tempora Recipe","text":""},{"location":"food/tempora/#ingredients","title":"Ingredients","text":"<ul> <li>Tempora from Korean market</li> <li>1 spoonful diced garlic</li> <li>Pepper Powder</li> <li>Half an onion</li> <li>Green Onion</li> <li>Soy sauce</li> <li>Sugar</li> </ul>"},{"location":"food/tempora/#cooking","title":"Cooking","text":"<ul> <li>Add the garlic</li> <li>Stir for a bit</li> <li>Add tiny amount of pepper powder</li> <li>Add tempora</li> <li>Add onion</li> <li>Add soy sauce and sugar to taste</li> <li>Stir at low heat for a long time</li> <li>Add green onion as a garnish</li> </ul>"},{"location":"phone/lineageos/","title":"Android Auto with microG and Lineage OS","text":"<p>These instructions are almost identical to Braga2's instructions with a single important change that is emphasized.</p> <p>References:</p> <p>Braga2's Instructions</p> <p>Google App Stub</p> <p>Oneplus build example</p> <p>Building LineageOS for Panther</p> <p>LineageOS with MicroG</p> <p>Docker to build LineageOS</p> <p>Android Auto Build</p>"},{"location":"server/cgit/","title":"Cgit with gitolite and caddy","text":""},{"location":"server/cgit/#setup","title":"Setup","text":"<p>Install dependencies.</p> <pre><code># apt install cgit python-is-python3 python3-pygments python3-markdown docutils-common groff perl\n</code></pre> <p>Make a git user.</p> <pre><code>sudo adduser --system --shell /bin/bash --group --disabled-password --home /home/git git\n</code></pre> <p>Allow ssh passwordless login.</p> <pre><code>usermod -p '*' username\n</code></pre>"},{"location":"server/cgit/#gitolite","title":"Gitolite","text":"<p>Install the gitolite package from the repository directly.</p>"},{"location":"server/cgit/#configuration-with-cgit","title":"Configuration with cgit","text":"<p>Configuration of gitolite is done by modifying <code>$HOME/.gitolite.rc</code>.</p> <p>To work correctly with cgit, gitweb and cgit configuration options need to work with gitolite.</p> <p>Change:</p> <pre><code>GIT_CONFIG_KEYS  =&gt;  '',\n</code></pre> <p>To:</p> <pre><code>GIT_CONFIG_KEYS  =&gt;  '.*',\n</code></pre> <p>To have permissions work correctly,</p> <p>Change:</p> <pre><code>UMASK  =&gt;  0077,\n</code></pre> <p>To:</p> <pre><code>UMASK  =&gt;  0027,\n</code></pre> <p>In the <code>ENABLE</code> field, add gitweb and cgit to the list.</p>"},{"location":"server/cgit/#usage","title":"Usage","text":"<p>Detailed usage of gitolite can be found here</p>"},{"location":"server/cgit/#repository-ignore","title":"Repository ignore","text":"<p>After cgit is configured, cgit can be told to ignore a repo with this syntax.</p> <pre><code>repo gitolite-admin\n    config cgit.ignore=1\n</code></pre>"},{"location":"server/cgit/#adding-hooks-to-gitolite","title":"Adding Hooks to gitolite","text":"<p>This page details how to add hooks to your repositories.</p> <p>Example hook that updates a website every git push. Make sure this directory is owned by git.</p> <pre><code>#!/bin/sh\nGIT_WORK_TREE=/desired/website/directory git checkout -f\n</code></pre>"},{"location":"server/cgit/#cgit","title":"Cgit","text":""},{"location":"server/cgit/#running-cgit-with-caddy","title":"Running cgit with caddy","text":"<p>Install the fcgiwrap package.</p> <p>Create a systemd service that wraps cgit with FastCGI.</p> <pre><code># systemctl edit --full --force cgit.service\n</code></pre> <pre><code>[Unit]\nDescription=CGI web interface to the Git SCM\nAfter=network.target\n\n[Service]\nType=exec\nExecStart=fcgiwrap -f -p \"/usr/lib/cgit/cgit.cgi\" -s tcp:127.0.0.1:8999\n\n[Install]\nWantedBy=multi-user.target\n</code></pre> <pre><code># systemctl start cgit\n</code></pre> <p>Add cgit configuration to caddy.</p> <pre><code>git.joshuayun.com {\n        handle_path /cgit-css/* {\n                root * /usr/share/cgit/\n                file_server\n        }\n\n        handle {\n                reverse_proxy localhost:8999 {\n                        transport fastcgi {\n                                env DOCUMENT_ROOT /usr/lib/cgit/\n                                env SCRIPT_FILENAME /usr/lib/cgit/cgit.cgi\n                        }\n                }\n        }\n}\n</code></pre>"},{"location":"server/cgit/#cgit-configuration","title":"Cgit configuration","text":"<p>More detailed documentation can be found on the cgitrc(5) manual.</p> <p>enable-git-config is used to allow for gitweb.* configurations in gitolite, e.g. description, owner.</p> <pre><code>enable-git-config=1\n</code></pre> <p>project-list sets where cgit looks for projects, this list is the one updated by gitolite</p> <pre><code>project-list=/home/git/projects.list\n</code></pre> <p>scan-path sets where the actual git repositories live</p> <pre><code>scan-path=/home/git/repositories\n</code></pre>"},{"location":"server/cgit/#references","title":"References","text":"<p>SixFoisNeuf Used this blog to run cgit using fcgiwrap rather than a caddy plugin. The entire cgit with caddy section was using his work.</p> <p>Mateja Maric Used this blog to help configure cgitrc, gitolite.rc</p> <p>Luke Hsiao Used the git user creation command from this blog.</p> <p>Omar Polo (yumh) Used this blog to help configure cgitrc for hidden repos.</p> <p>Bryan Brattlof Not much used here, kept as reference.</p>"},{"location":"server/ddns/","title":"DDNS Setup","text":""},{"location":"server/ddns/#porkbun-api","title":"Porkbun API","text":"<p>Follow this porkbun guide on enabling the api for your domain.</p>"},{"location":"server/ddns/#ddns-updater","title":"ddns-updater","text":"<p>ddns-updater is the program used to update Porkbun's A record of your domain.</p>"},{"location":"server/ddns/#docker-install","title":"Docker install","text":"<p>Install the docker package from official docker repositories.</p>"},{"location":"server/ddns/#setup","title":"Setup","text":"<p>Create a directory with config.json inside, and make sure that its owner has a uid of 1000.</p> <pre><code>mkdir data\ntouch data/config.json\n# Owned by user ID of Docker container (1000)\nchown -R 1000 data\n# all access (for creating json database file data/updates.json)\nchmod 700 data\n# read access only\nchmod 400 data/config.json\n</code></pre> <p>Configuration for porkbun in config.json</p> <pre><code>{\n  \"settings\": [\n    {\n      \"provider\": \"porkbun\",\n      \"domain\": \"domain.com\",\n      \"host\": \"@\",\n      \"api_key\": \"PORKBUN SECRET KEY\",\n      \"secret_api_key\": \"PORKBUN API KEY\",\n      \"ip_version\": \"ipv4\"\n    }\n  ]\n}\n</code></pre> <p>Optional <code>\"ttl\"</code> paramter specifing A record TTL not included.</p>"},{"location":"server/ddns/#usage","title":"Usage","text":"<pre><code>docker run -d -p 8000:8000/tcp -v \"$(pwd)\"/data:/updater/data qmcgaw/ddns-updater\n</code></pre> <p>This will start a docker container that will start updating the DNS records. Status updates can be seen in a web server by going to localhost:8000.</p>"},{"location":"server/server/","title":"Homelab Server Setup","text":"<p>This page describes how I setup my personal webserver</p> <p>I'm hosting a website, wiki, caldav using Radicale, git using cgit and Gitolite, and webdav support</p>"},{"location":"server/server/#linux-distribution-used","title":"Linux Distribution Used","text":"<p>Debian 12 Bookworm.</p> <p>Update the system.</p> <pre><code># apt update\n# apt upgrade\n</code></pre>"},{"location":"server/server/#ssh","title":"SSH","text":"<p>Generate ssh keys</p> <pre><code>ssh-keygen -t [keytype]\n</code></pre> <p>Add ssh keys to <code>~/.ssh/authorized_keys</code></p> <pre><code>ssh-copy-id -i /path/to/pubkey [user@]machine\n</code></pre>"},{"location":"server/server/#optional-security-enhancements","title":"Optional security enhancements","text":"<p>Change the port in <code>/etc/sshd_config</code> to a nonstandard port to harden security.</p> <pre><code>Port 1234\n</code></pre> <p>Disable password login in <code>/etc/sshd_config/</code></p> <pre><code>PubkeyAuthentication yes\nChallengeResponseAuthentication no\nPasswordAuthentication no\nKbdInteractiveAuthentication no\nUsePAM no\n</code></pre> <p>Disable XForwarding</p> <pre><code>X11Forwarding no\n</code></pre> <p>Disable remote root login</p> <pre><code>PermitRootLogin no\n</code></pre> <p>Disable root account</p> <pre><code>$ sudo chsh -s /sbin/nologin root\n</code></pre>"},{"location":"server/server/#ddns","title":"DDNS","text":"<p>Setup Dyanmic DNS (ddns) with Porkbun and ddns-updater.</p>"},{"location":"server/server/#caddy","title":"Caddy","text":"<p>Install the Caddy package from Caddy directly.</p>"},{"location":"server/server/#cgit-gitolite","title":"Cgit &amp; gitolite","text":"<p>Setup cgit with gitolite and caddy.</p>"},{"location":"server/server/#radicale","title":"Radicale","text":"<p>Install the Radicale package.</p> <p>Start the Radicale service.</p> <pre><code>systemctl enable radicale.service\nsystemctl start radicale.service\n</code></pre> <p>Generate secure passwords using htpasswd.</p> <pre><code># Create a new htpasswd file with the user \"user1\"\n$ htpasswd -c /path/to/users user1\nNew password:\nRe-type new password:\n# Add another user\n$ htpasswd /path/to/users user2\nNew password:\nRe-type new password:\n</code></pre> <p>Edit configuration to add users</p> <pre><code>[auth]\ntype = htpasswd\nhtpasswd_filename = /path/to/users\n# encryption method used in the htpasswd file\nhtpasswd_encryption = md5\n</code></pre> <p>Add configuration to caddy.</p> <pre><code>caldav.joshuayun.com {\n    handle_path /* {\n        reverse_proxy localhost:5232 {\n        header_up X-Script-Name /radicale\n        }\n    }\n    handle_path /radicale/* {\n        reverse_proxy localhost:5232 {\n            header_up X-Script-Name /radicale\n        }\n    }\n}\n</code></pre>"},{"location":"server/server/#webdav","title":"Webdav","text":"<p>Add the Webdav module to Caddy.</p> <pre><code>sudo caddy add-package github.com/mholt/caddy-webdav\nsudo systemctl restart caddy\n</code></pre> <p>Add Webdav to the Caddy configuration</p> <p>Example configuration with protected file browsing, see the github for more configurations.</p> <pre><code>webdav.joshuayun.com {\n    @get method GET\n    root * WEBDAV_PATH\n    route {\n        basicauth {\n            joshua CADDY_HASH\n        }\n        file_server @get browse\n        webdav\n    }\n}\n</code></pre> <p>To generate the hash:</p> <pre><code>caddy hash-password\n</code></pre>"},{"location":"server/syncthing/","title":"Syncthing Setup","text":"<p>I am currently using syncthing for my music to be synced across devices.</p>"},{"location":"server/syncthing/#installation","title":"Installation","text":"<p>Install the Syncthing package from upstream repositories.</p>"},{"location":"server/syncthing/#reverse-proxy-setup-ref","title":"Reverse proxy setup [Ref]","text":"<p>Example syncthing reverse proxy setup. </p> <pre><code>sync.joshuayun.com {\n        handle_path /* {\n                reverse_proxy http://localhost:8384 {\n                        header_up Host {upstream_hostport}\n                }\n        }\n}\n</code></pre> <p>Optional: Add a htpasswd to block unauthorized access to the syncthing.</p>"},{"location":"server/syncthing/#syncthing-system-service-ref","title":"Syncthing system service [Ref]","text":"<p>Enable the syncthing user service.</p> <pre><code>systemctl enable syncthing@myuser.service\nsystemctl start syncthing@myuser.service\n</code></pre>"},{"location":"server/syncthing/#syncthing-configuration","title":"Syncthing configuration","text":"<p>Done all through the gui. It is recommended to setup a user login, especially if you are making a syncthing that is exposed to the open internet.</p>"}]}
\ No newline at end of file
diff --git a/site/sitemap.xml b/site/sitemap.xml
index dab0e75..f2a2959 100644
--- a/site/sitemap.xml
+++ b/site/sitemap.xml
@@ -2,67 +2,67 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
          <loc>https://wiki.joshuayun.com/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/about/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/desktop/desktop/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/desktop/syncthing/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/desktop/thunderbird/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/food/curry/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/food/spicy-shrimp/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/food/tempora/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/phone/lineageos/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/server/cgit/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/server/ddns/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/server/server/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://wiki.joshuayun.com/server/syncthing/</loc>
-         <lastmod>2024-01-03</lastmod>
+         <lastmod>2024-01-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
 </urlset>
\ No newline at end of file
diff --git a/site/sitemap.xml.gz b/site/sitemap.xml.gz
index d7b4a2a..6d34d99 100644
--- a/site/sitemap.xml.gz
+++ b/site/sitemap.xml.gz