Git - Revision history

Doug: delete "what is stored where"

2025-01-29T11:35:48Z

delete "what is stored where"

← Older revision		Revision as of 13:35, 29 January 2025
Line 6:		Line 6:
	== [https://forgejo.org/ Forgejo] ==		== [https://forgejo.org/ Forgejo] ==
	Forgejo is (code) forge. It provides a central location for git repositories so we can synchronize easily (otherwise we'd have to run around with USB sticks), a web interface (so you can make edits without using the terminal, or even having the files on your laptop) and an issue tracker (so you can have discussions separate-but-beside the project files)		Forgejo is (code) forge. It provides a central location for git repositories so we can synchronize easily (otherwise we'd have to run around with USB sticks), a web interface (so you can make edits without using the terminal, or even having the files on your laptop) and an issue tracker (so you can have discussions separate-but-beside the project files)

	~~== What is stored where? ==~~
	~~Among other things we have the following repositories:~~

	* [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/.
	* [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here.
	* [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here.
	* [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.

	== How to get started ==		== How to get started ==

Doug: format list

2025-01-29T11:34:39Z

format list

← Older revision		Revision as of 13:34, 29 January 2025
Line 90:		Line 90:
	SSH_LISTEN_HOST = 0.0.0.0		SSH_LISTEN_HOST = 0.0.0.0
	SSH_DOMAIN = ssh.git.kanthaus.online</pre>		SSH_DOMAIN = ssh.git.kanthaus.online</pre>
	Then, set up a port forwarding in OpenWISP. You need to be connected to the <code>kanthaus-admin</code> network for this and go to [https://192.168.178.1/firewall_nat.php the NAT Port Forward page]. Create a new rule: * Interface: WAN * TCP/IP version: IPv4+IPv6 * Protocol: TCP * Destination: WAN address * Destination port range: (other) 2222 to (other) 2222 * Redirect target port: 2222 * Description: git SSH access for Forgejo		Then, set up a port forwarding in OpenWISP. You need to be connected to the <code>kanthaus-admin</code> network for this and go to [https://192.168.178.1/firewall_nat.php the NAT Port Forward page]. Create a new rule:

			* Interface: WAN
			* TCP/IP version: IPv4+IPv6
			* Protocol: TCP
			* Destination: WAN address
			* Destination port range: (other) 2222 to (other) 2222
			* Redirect target port: 2222
			* Description: git SSH access for Forgejo

	The <code>ssh.git.kanthaus.online</code> should point to the Fritzbox (not kanthaus-server) so that it can take care of forwarding the port. If the domain points to kanthaus-server, connecting over IPv6 will likely fail.		The <code>ssh.git.kanthaus.online</code> should point to the Fritzbox (not kanthaus-server) so that it can take care of forwarding the port. If the domain points to kanthaus-server, connecting over IPv6 will likely fail.

Doug: major rewrite of everything but "info for admins"

2025-01-29T11:31:43Z

major rewrite of everything but "info for admins"

← Older revision		Revision as of 13:31, 29 January 2025
Line 1:		Line 1:
	📋️ We use Git ~~to store mutable data~~. ~~Our Git repositories are hosted with [https://forgejo.org~~ Forgejo] on [[Server\|our ~~own~~ server]]. ~~For immutable files we have a [[Nextcloud]] in the same location~~.		💻 We use Git through Forgejo for working together on code and similar projects. We host our own instance of Forgejo on [[Server\|our server]] ➡️ https://git.kanthaus.online/

	== ~~What is Forgejo?~~ ==		== [https://git-scm.com/ Git] ==
	~~Forgejo~~ is ~~basically~~ a ~~social network built~~ on ~~top~~ of the [https://git-scm.com/book/en/v2/Getting-Started-~~Git~~-~~Basics~~ git ~~technology~~] ~~for version control. It is normally used for code, because it makes it easy to collaborate on common projects without breaking anything.~~		Git is a distributed version control system. It allows many people to work on different copies of the same project, and merge the different changes in a coherent way. It's like a multiverse/time-machine for files. An actually-pretty-good game for learning git is [https://ohmygit.org/ Oh My Git!] (Linux, macOS, and Windows) and a good book is [https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control git-scm.com]

	== ~~Why did you decide to use this?~~ ==		== [https://forgejo.org/ Forgejo] ==
	* We want to help people learn things and appreciate technology!		Forgejo is (code) forge. It provides a central location for git repositories so we can synchronize easily (otherwise we'd have to run around with USB sticks), a web interface (so you can make edits without using the terminal, or even having the files on your laptop) and an issue tracker (so you can have discussions separate-but-beside the project files)
	* Data that was put in git is ~~extremely secure, because it’s stored on multiple people’s computers~~.
	* If multiple people work on the same file it’s possible to ~~tell who changed which exact character.~~
	* It’s easy to put content from Forgejo onto our website.
	* Everybody becomes a ~~webmaster. 🙂~~
	* The people who decided on ~~this were already used to it… 😉~~

	== What is stored where? ==		== What is stored where? ==
Line 20:		Line 15:
	* [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.		* [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.

	== How to ~~use it~~ ==		== How to get started ==
	Go to https://git.kanthaus.online and ~~log in with your Nextcloud account. You~~ will be automatically added to the “Kanthaus” organization in which our repositories are stored~~: https://git.kanthaus~~.~~online/kanthaus~~		We use our [[Nextcloud]] accounts for signing into Forgejo, so you'll need one of those first. Then login to https://git.kanthaus.online/ and you will be automatically added to the “Kanthaus” organization in which our repositories are stored.

	~~You can modify the files there directly via your web browser~~.		== Migrating from Gitlab ==
			Before Forgejo, we used Gitlab. If you still have local clones from Gitlab, you need to update those to point to Forgejo.

	~~== Cloning repositories on your machine ==~~		On the page of each repository, such as https://git.kanthaus.online/kanthaus/handbook, copy the clone URL you prefer. For instance, for the handbook, they look like this:
	~~If you are working with local clones~~, you ~~need to update those to point to Kanthaus Git instead of GitLab (which we were using before Forgejo)~~.

	~~On the page of each repository, such as~~ https://git.kanthaus.online/kanthaus/handbook~~, copy the clone URL you prefer~~. ~~For instance, for the handbook, they look like this: * HTTPS: <code>~~https://git.kanthaus.online/kanthaus/handbook.git~~</code>~~ * SSH: ~~<code>~~ssh://git@ssh.git.kanthaus.online:2222/kanthaus/handbook.git</~~code>~~		* HTTPS: [https://git.kanthaus.online/kanthaus/handbook.git)` https://git.kanthaus.online/kanthaus/handbook.git]
			* SSH: [ssh://git@ssh.git.kanthaus.online:2222/kanthaus/handbook.git)` ssh://git@ssh.git.kanthaus.online:2222/kanthaus/handbook.git]

	In your local clone, run:		In your local clone, run:
			git remote set-url origin <new-url>
	~~<pre>~~git remote set-url origin ~~<~~new-url~~></pre~~>
	Note that if you want to use SSH URLs, you first need to [https://git.kanthaus.online/user/settings/keys add an SSH key].		Note that if you want to use SSH URLs, you first need to [https://git.kanthaus.online/user/settings/keys add an SSH key].

Janina at 10:58, 29 January 2025

2025-01-29T10:58:54Z

← Older revision		Revision as of 12:58, 29 January 2025
Line 15:		Line 15:
	Among other things we have the following repositories:		Among other things we have the following repositories:

	* - [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/.		* [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/.
	* - [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here.		* [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here.
	* - [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here.		* [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here.
	* - [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.		* [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.

	== How to use it ==		== How to use it ==

Janina at 10:58, 29 January 2025

2025-01-29T10:58:33Z

← Older revision		Revision as of 12:58, 29 January 2025
Line 13:		Line 13:

	== What is stored where? ==		== What is stored where? ==
	~~So far~~ we have the following repositories: - [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/. - [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here. - [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here. - [https://git.kanthaus.online/kanthaus/kanthaus-ansible kanthaus-ansible] is for keeping our server tidy. Nothing you need to worry about, except you’re actually interested. In that case feel free to ask Matthias about it! - [https://git.kanthaus.online/kanthaus/handbook handbook] is where this handbook is stored. - [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.		Among other things we have the following repositories:

			* - [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/.
			* - [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here.
			* - [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here.
			* - [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.

	== How to use it ==		== How to use it ==
Line 123:		Line 128:
	* restore the contents of <code>/data/services/forgejo</code>		* restore the contents of <code>/data/services/forgejo</code>
	* restore the database similarly with: <code>cat forgejo_database_dump.sql.gz \| gunzip \| docker exec -i <container-id> psql -U postgres forgejo</code>		* restore the database similarly with: <code>cat forgejo_database_dump.sql.gz \| gunzip \| docker exec -i <container-id> psql -U postgres forgejo</code>
			[[Category:Digital]]

Antonin: /* Backing up Forgejo’s data */ fix botched markup

2025-01-18T13:11:32Z

Backing up Forgejo’s data: fix botched markup

← Older revision		Revision as of 15:11, 18 January 2025
Line 112:		Line 112:
	=== Backing up Forgejo’s data ===		=== Backing up Forgejo’s data ===

	You need to back up two things: * the contents of <code>/data/services/forgejo</code> * the Postgresql database. To do so: * First, find out the container id of the postgres instance with <code>docker ps \| grep kh-services_postgres</code> and copy the first hash in the output to the second command, in place of <code><container-id></code> * Run <code>docker exec -it <container-id> pg_dump -U postgres --clean forgejo \| gzip > forgejo_database_dump.sql.gz</code>		You need to back up two things:
			* the contents of <code>/data/services/forgejo</code>
			* the Postgresql database.

	To restore the backup, you need to: * restore the contents of <code>/data/services/forgejo</code> * restore the database similarly with: <code>cat forgejo_database_dump.sql.gz \| gunzip \| docker exec -i <container-id> psql -U postgres forgejo</code>		To do so:
			* First, find out the container id of the postgres instance with <code>docker ps \| grep kh-services_postgres</code> and copy the first hash in the output to the second command, in place of <code><container-id></code>
			* Run <code>docker exec -it <container-id> pg_dump -U postgres --clean forgejo \| gzip > forgejo_database_dump.sql.gz</code>

			To restore the backup, you need to:
			* restore the contents of <code>/data/services/forgejo</code>
			* restore the database similarly with: <code>cat forgejo_database_dump.sql.gz \| gunzip \| docker exec -i <container-id> psql -U postgres forgejo</code>

Antonin: /* Setting it up from scratch */

2025-01-18T13:07:58Z

Setting it up from scratch

← Older revision		Revision as of 15:07, 18 January 2025
Line 40:		Line 40:
	* Site title: “Kanthaus Git”		* Site title: “Kanthaus Git”
	* SMTP host: gehrels.uberspace.de		* SMTP host: gehrels.uberspace.de
	* SMTP port: 587		* SMTP port: 587
	Send email as: git@kanthaus.online		* Send email as: git@kanthaus.online
	* SMTP user: git@kanthaus.online		* SMTP user: git@kanthaus.online
	* SMTP password: found in the Kanthaus keepass		* SMTP password: found in the Kanthaus keepass

Antonin: /* Instructions for administrators */ fix markup botched by the migration from the handbook :(

2025-01-18T13:07:36Z

Instructions for administrators: fix markup botched by the migration from the handbook :(

@@ Line 36: / Line 36: @@
 === Setting it up from scratch ===
-After launching the service via Docker, the following manual steps need to be taken to configure the instance: * Go to https://git.kanthaus.online/ where the set-up screen should display. Change the following settings: * Site title: “Kanthaus Git” * SMTP host: gehrels.uberspace.de * SMTP port: 587 * Send email as: git@kanthaus.online * SMTP user: git@kanthaus.online * SMTP password: found in the Kanthaus keepass * Tick “Enable email notifications” * Tick “Disable Gravatar” * Tick “Allow registration only via external services” * Tick “Hide email addresses by default” * Domain for hidden email addresses: <code>git.kanthaus.online</code> * Set up an admin user with credentials you own: we will delete it later on * After validating the sign-up form, go to https://git.kanthaus.online/org/create and create a “kanthaus” organization. You can prettify it a little, by adding a bit of metadata at https://git.kanthaus.online/org/kanthaus/settings and uploading a logo from https://kanthaus.online/pics/newLogo.png * In Forgejo’s configuration file (<code>/data/services/forgejo/config/app.ini</code>), add the following lines at the end:
+After launching the service via Docker, the following manual steps need to be taken to configure the instance:
 <pre>[oauth2_client]

Worldsdweller: Emoji preservation efforts.

2024-10-18T11:14:50Z

Emoji preservation efforts.

← Older revision		Revision as of 13:14, 18 October 2024
Line 1:		Line 1:
	~~<nowiki>:</nowiki>clipboard:~~ We use Git to store mutable data. Our Git repositories are hosted with [https://forgejo.org Forgejo] on [[Server\|our own server]]. For immutable files we have a [[Nextcloud]] in the same location.		📋️ We use Git to store mutable data. Our Git repositories are hosted with [https://forgejo.org Forgejo] on [[Server\|our own server]]. For immutable files we have a [[Nextcloud]] in the same location.

	== What is Forgejo? ==		== What is Forgejo? ==
Line 9:		Line 9:
	* If multiple people work on the same file it’s possible to tell who changed which exact character.		* If multiple people work on the same file it’s possible to tell who changed which exact character.
	* It’s easy to put content from Forgejo onto our website.		* It’s easy to put content from Forgejo onto our website.
	* Everybody becomes a webmaster. :)		* Everybody becomes a webmaster. 🙂
	* The people who decided on this were already used to it… ;)		* The people who decided on this were already used to it… 😉

	== What is stored where? ==		== What is stored where? ==

Worldsdweller: Post-migration cleanup

2024-10-16T10:46:21Z

Post-migration cleanup

← Older revision		Revision as of 12:46, 16 October 2024
Line 1:		Line 1:
	= :clipboard: ~~Git =~~		<nowiki>:</nowiki>clipboard: We use Git to store mutable data. Our Git repositories are hosted with [https://forgejo.org Forgejo] on [[Server\|our own server]]. For immutable files we have a [[Nextcloud]] in the same location.

	We use Git to store mutable data. Our Git repositories are hosted with [https://forgejo.org Forgejo] on [[~~server.md~~\|our own server]]. For immutable files we have a [[~~nextcloud.md\|~~Nextcloud]] in the same location.

	~~=== What is Forgejo? ===~~

			== What is Forgejo? ==
	Forgejo is basically a social network built on top of the [https://git-scm.com/book/en/v2/Getting-Started-Git-Basics git technology] for version control. It is normally used for code, because it makes it easy to collaborate on common projects without breaking anything.		Forgejo is basically a social network built on top of the [https://git-scm.com/book/en/v2/Getting-Started-Git-Basics git technology] for version control. It is normally used for code, because it makes it easy to collaborate on common projects without breaking anything.

	=== Why did you decide to use this? ===		== Why did you decide to use this? ==

	* We want to help people learn things and appreciate technology!		* We want to help people learn things and appreciate technology!
	* Data that was put in git is extremely secure, because it’s stored on multiple people’s computers.		* Data that was put in git is extremely secure, because it’s stored on multiple people’s computers.
Line 16:		Line 12:
	* The people who decided on this were already used to it… ;)		* The people who decided on this were already used to it… ;)

	=== What is stored where? ===		== What is stored where? ==
			So far we have the following repositories: - [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/. - [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here. - [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here. - [https://git.kanthaus.online/kanthaus/kanthaus-ansible kanthaus-ansible] is for keeping our server tidy. Nothing you need to worry about, except you’re actually interested. In that case feel free to ask Matthias about it! - [https://git.kanthaus.online/kanthaus/handbook handbook] is where this handbook is stored. - [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.
	So far we have the following repositories: - [https://git.kanthaus.online/kanthaus/kanthaus.online kanthaus.online], where we store our website, https://kanthaus.online/. - [https://git.kanthaus.online/kanthaus/kanthaus-private kanthaus-private], where we store our [[~~residencerecord.md\|~~residence record]], internal meeting minutes, financial plans and other stuff that contains personal information. Everything of relevance that consists of text and has pieces of confidential data should be put here. - [https://git.kanthaus.online/kanthaus/kanthaus-public kanthaus-public], which is publicly accessible as the name suggests. In this repository we do our task management via issues (which you can find [https://git.kanthaus.online/kanthaus/kanthaus-public/issues here]). This is especially important for our [[../social/roadmap.md\|roadmap plannings]]. Other than that we have drafts, policies, signs, data on our water, electricity and gas usage and much more in here. - [https://git.kanthaus.online/kanthaus/kanthaus-ansible kanthaus-ansible] is for keeping our server tidy. Nothing you need to worry about, except you’re actually interested. In that case feel free to ask Matthias about it! - [https://git.kanthaus.online/kanthaus/handbook handbook] is where this handbook is stored. - [https://gitlab.com/kanthaus/expfloorer expfloorer] hosts a floorplan of Kanthaus.

	~~=== How to use it ===~~

			== How to use it ==
	Go to https://git.kanthaus.online and log in with your Nextcloud account. You will be automatically added to the “Kanthaus” organization in which our repositories are stored: https://git.kanthaus.online/kanthaus		Go to https://git.kanthaus.online and log in with your Nextcloud account. You will be automatically added to the “Kanthaus” organization in which our repositories are stored: https://git.kanthaus.online/kanthaus

	You can modify the files there directly via your web browser.		You can modify the files there directly via your web browser.

	=== Cloning repositories on your machine ===		== Cloning repositories on your machine ==

	If you are working with local clones, you need to update those to point to Kanthaus Git instead of GitLab (which we were using before Forgejo).		If you are working with local clones, you need to update those to point to Kanthaus Git instead of GitLab (which we were using before Forgejo).