Merge branch 'develop' into feature/396-localisation

.gitlab/issue_templates/Default.md

@@ -0,0 +1,32 @@
+- [ ] I have searched the issues to make sure I am not opening a duplicate
+- [ ] If this is a jschan installation/setup issue, I have followed the INSTALLATION.md
+- [ ] I am asking a [SMART QUESTION](http://www.catb.org/~esr/faqs/smart-questions.html)
+- [ ] Leave this box unchecked to prove you actually bothered to read
+
+## Issue report
+
+### Description
+A clear and concise description of what the problem is.
+
+### Steps to reproduce (if applicable)
+
+1. Click on '...'
+3. Scroll down to '....'
+4. See error
+
+### Expected result
+What did you expect to happen?
+
+### Actual result
+What actually happened?
+
+### Possible solution
+Optional, if you have a suggestion.
+
+### Additional information
+For example, screenshots and log excerpts.
+
+### Environment
+Device:
+Operating System and version:
+Browser and version:

INSTALLATION.md

@@ -27,16 +27,15 @@
 
 ```bash
 sudo apt update -y
-sudo apt install curl wget gnupg nginx ffmpeg imagemagick graphicsmagick python-certbot-nginx fonts-dejavu -y
+sudo apt install curl wget gnupg nginx ffmpeg imagemagick graphicsmagick python3-certbot-nginx fonts-dejavu -y
 ```
 
 **3. Install MongoDB**
 
 [MongoDB Installation](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-debian/#install-mongodb-community-edition-on-debian):
 ```bash
-#NOTE: this installs mongodb 4.4 for compatibility reasons only. Newer versions (6.x) are recommended)
-wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -
-echo "deb http://repo.mongodb.org/apt/debian $(lsb_release -sc)/mongodb-org/4.4 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list
+wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
+echo "deb http://repo.mongodb.org/apt/debian $(lsb_release -sc)/mongodb-org/6.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
 sudo apt update -y
 sudo apt install -y mongodb-org
 sudo systemctl enable --now mongod

configs/nginx/nginx.sh

@@ -122,6 +122,7 @@ EOF
 	"
 	fi
 
+	if [ "$NOHTTPS" != "y" ]; then
 			HTTPS_MIDSECTION="
 	listen [::]:443 ssl ipv6only=on;
 	listen 443 ssl;
@@ -140,7 +141,8 @@ server {
 
 	server_name $CLEARNET_SERVER_NAME;
 	return 444;
-			"
+"
+	fi
 
 	#onion_location redirect header
 	ONION_LOCATION=""
@@ -236,7 +238,7 @@ echo "Writing main jschan vhost config..."
 printf "$JSCHAN_CONFIG" > /etc/nginx/sites-available/$SITES_AVAILABLE_NAME
 sudo ln -s -f /etc/nginx/sites-available/$SITES_AVAILABLE_NAME /etc/nginx/sites-enabled/$SITES_AVAILABLE_NAME
 
-if [ "$NOHTTPS" == "Y" ]; then
+if [ "$NOHTTPS" == "y" ]; then
 	echo "Adjusting config snippets to support NOHTTPS mode..."
 	sudo sed -i "s/Forwarded-Proto https/Forwarded-Proto http/g" /etc/nginx/snippets/jschan_clearnet_routes.conf
 fi