Selaa lähdekoodia

Merge branch 'master' into docker_monitor

Robert Middleswarth 3 vuotta sitten
vanhempi
commit
71abdc633a

+ 51 - 0
.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,51 @@
+name: Bug Report
+description: File a bug report
+title: '[BUG] <title>'
+body:
+  - type: textarea
+    attributes:
+      label: Bug Description
+      description: >-
+        What is the bug? Please provide a snippet of output including
+        any errors and the messages logged before the error.
+        Verbose or debug logs are preferred but please ensure all secrets and
+        other sensitive information has been removed.
+      placeholder: I did ... and ... happened.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: |
+        What did you expect to happen? For example, expected output or behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: >-
+        Please provide the steps that can be used to reproduce this behavior.
+
+        If possible, please include an example project (GitHub repository) that
+        is capable of reproducing this behavior.
+        The example project should only include the minimum required code
+        to reproduce the issue.
+        It should not depend on any external resource.
+      value: |
+        Example project: ...
+
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

+ 1 - 0
.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

+ 17 - 0
.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[REQUEST] feature"
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

+ 11 - 0
.github/ISSUE_TEMPLATE/general_question.md

@@ -0,0 +1,11 @@
+---
+name: General Question
+about: General question about the project, usage, design, etc.
+title: "[QUESTION]"
+---
+
+**Question**
+Your question here.
+
+**Context**
+Any additional context around the question such a link to a project where it's being implemented.

+ 0 - 3
.github/pull_request_template.md

@@ -37,11 +37,8 @@
 # Checklist
 # Checklist
 
 
 <!-- You can erase any parts of this template not applicable to your Pull Request. -->
 <!-- You can erase any parts of this template not applicable to your Pull Request. -->
-- [ ] Have you followed the guidelines in our Contributing document?
 - [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
 - [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
 - [ ] Does your submission pass tests?
 - [ ] Does your submission pass tests?
 - [ ] Have you linted your code locally prior to submission?
 - [ ] Have you linted your code locally prior to submission?
 - [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
 - [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-- [ ] Have you written new tests for your core changes, as applicable?
-- [ ] Have you successfully ran tests with your changes locally?
 - [ ] Have you updated documentation, as applicable?
 - [ ] Have you updated documentation, as applicable?

+ 1 - 1
.github/workflows/lint.yml

@@ -16,7 +16,7 @@ name: Lint Code Base
 #############################
 #############################
 on:
 on:
   push:
   push:
-    branches-ignore: [beta, main]
+    branches-ignore: [beta, master]
     # Remove the line above to run when pushing to master
     # Remove the line above to run when pushing to master
 
 
 ###############
 ###############

+ 2 - 0
pi-hosted_template/images/desktop.ini

@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+portainer.png=@portainer.png,0

BIN
pi-hosted_template/images/omv.png


BIN
pi-hosted_template/images/paperless.png


BIN
pi-hosted_template/images/portainer.png


+ 45 - 1
pi-hosted_template/template/portainer-v2.json

@@ -17,6 +17,10 @@
 					"label": "PGID",
 					"label": "PGID",
 					"name": "PGID"
 					"name": "PGID"
 				},
 				},
+                                {
+                                        "label": "TZ",
+                                        "name": "TZ"
+                                },
 				{
 				{
 					"label": "CONTEXT_PATH",
 					"label": "CONTEXT_PATH",
 					"name": "CONTEXT_PATH",
 					"name": "CONTEXT_PATH",
@@ -641,7 +645,7 @@
 			"name": "librespeed",
 			"name": "librespeed",
 			"platform": "linux",
 			"platform": "linux",
 			"ports": [
 			"ports": [
-				"83:83/tcp"
+				"83:80/tcp"
 			],
 			],
 			"restart_policy": "unless-stopped",
 			"restart_policy": "unless-stopped",
 			"title": "LibreSpeed",
 			"title": "LibreSpeed",
@@ -4226,6 +4230,46 @@
 				}
 				}
 			]
 			]
 		},
 		},
+		{
+			"categories": [
+				"Cloud",
+				"Management",
+				"Productivity"
+			],
+			"description": "Paperless is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. https://github.com/jonaswinkler/paperless-ng",
+			"image": "linuxserver/paperless-ng",
+			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/pi-hosted_template/images/paperless.png",
+			"name": "paperless",
+			"platform": "linux",
+			"ports": [
+				"8005:8000/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "Paperless",
+			"type": 1,
+			"env": [
+				{
+					"default": "1000",
+					"label": "PUID",
+					"name": "PUID"
+				},
+				{
+					"default": "1000",
+					"label": "PGID",
+					"name": "PGID"
+				}
+			],
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/paperless/config",
+					"container": "/config"
+				},
+				{
+					"bind": "/portainer/Files/AppData/Config/paperless/data",
+					"container": "/data"
+				}
+			]
+		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Other",
 				"Other",

+ 0 - 1
rpi_docker_monitor.sh

@@ -27,4 +27,3 @@ sudo touch /portainer/Files/AppData/Config/grafana/grafana.ini || error "Failed
 echo "Setting permissions..."
 echo "Setting permissions..."
 sudo chown -R 472:472 /portainer/Files/AppData/Config/grafana/data || error "Failed to set permissions for Grafana data!"
 sudo chown -R 472:472 /portainer/Files/AppData/Config/grafana/data || error "Failed to set permissions for Grafana data!"
 echo "Done You are ready to goto next step in the install document"
 echo "Done You are ready to goto next step in the install document"
-

+ 13 - 7
rpi_nginx-proxy-manager.sh

@@ -1,8 +1,14 @@
-#!/bin/sh
-echo "creating directories"
-sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/data
-sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/letsencrypt
-sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/database
+#!/bin/bash
+
+function error {
+  echo -e "\\e[91m$1\\e[39m"
+  exit 1
+}
+
+echo "Creating directories..."
+sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/data || error "Failed to create data folder!"
+sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/letsencrypt || error "Failed to create letsencrypt folder!"
+sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/database || error "Failed to create database folder!"
 echo "Creating a blank nginx-proxy-manager config files"
 echo "Creating a blank nginx-proxy-manager config files"
-sudo touch /portainer/Files/AppData/Config/nginx-proxy-manager/config.json
-echo "done you can now install the stack"
+sudo touch /portainer/Files/AppData/Config/nginx-proxy-manager/config.json || error "Failed to touch config.json file!"
+echo "Setup complete. You can now install the stack using the App Template."