librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into staging

This commit is contained in:
florian 2023-05-22 15:59:38 +02:00
parent dfcaba9ad2 7506768c4a
commit d5fcc69694
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
14 changed files with 37 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/assets/img/integration-ansible.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 KiB

After

Width:  |  Height:  |  Size: 91 KiB

5
docs/assets/img/integration-linux.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 98 KiB

65
misc/integrations/k8s.mysql.ui.yml
View File

@ -124,7 +124,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
---
apiVersion: apps/v1
kind: Deployment
@ -151,7 +151,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
---
apiVersion: apps/v1
kind: Deployment
@ -213,64 +213,6 @@ spec:
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: bunkerweb-redis
spec:
replicas: 1
strategy:
type: Recreate
selector:
matchLabels:
app: bunkerweb-redis
template:
metadata:
labels:
app: bunkerweb-redis
spec:
containers:
- name: bunkerweb-redis
image: redis:7-alpine
imagePullPolicy: Always
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: bunkerweb-db
spec:
replicas: 1
strategy:
type: Recreate
selector:
matchLabels:
app: bunkerweb-db
template:
metadata:
labels:
app: bunkerweb-db
spec:
containers:
- name: bunkerweb-db
image: mariadb:10.10
imagePullPolicy: Always
env:
- name: MYSQL_RANDOM_ROOT_PASSWORD
value: "yes"
- name: "MYSQL_DATABASE"
value: "db"
- name: "MYSQL_USER"
value: "bunkerweb"
- name: "MYSQL_PASSWORD"
value: "changeme"
volumeMounts:
- mountPath: "/var/lib/mysql"
name: vol-db
volumes:
- name: vol-db
persistentVolumeClaim:
claimName: pvc-bunkerweb
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: bunkerweb-ui
spec:
@ -300,7 +242,7 @@ spec:
- name: KUBERNETES_MODE
value: "YES"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
---
apiVersion: v1
kind: Service
@ -363,7 +305,6 @@ spec:
resources:
requests:
storage: 5Gi
volumeName: pv-bunkerweb
---
apiVersion: networking.k8s.io/v1
kind: Ingress

5
misc/integrations/k8s.mysql.yml
View File

@ -124,7 +124,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
---
apiVersion: apps/v1
kind: Deployment
@ -150,7 +150,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
---
apiVersion: apps/v1
kind: Deployment
@ -257,4 +257,3 @@ spec:
resources:
requests:
storage: 5Gi
volumeName: pv-bunkerweb

21
misc/integrations/k8s.postgres.ui.yml
View File

@ -124,7 +124,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
---
apiVersion: apps/v1
kind: Deployment
@ -151,7 +151,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
---
apiVersion: apps/v1
kind: Deployment
@ -201,6 +201,8 @@ spec:
value: "bunkerweb"
- name: "POSTGRES_PASSWORD"
value: "changeme"
- name: "PGDATA"
value: "/var/lib/postgresql/data/pgdata"
volumeMounts:
- mountPath: "/var/lib/postgresql/data"
name: vol-db
@ -240,7 +242,7 @@ spec:
- name: KUBERNETES_MODE
value: "YES"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
---
apiVersion: v1
kind: Service
@ -303,19 +305,6 @@ spec:
resources:
requests:
storage: 5Gi
volumeName: pv-bunkerweb
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: pvc-bunkerweb
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
volumeName: pv-bunkerweb
---
apiVersion: networking.k8s.io/v1
kind: Ingress

7
misc/integrations/k8s.postgres.yml
View File

@ -124,7 +124,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
---
apiVersion: apps/v1
kind: Deployment
@ -150,7 +150,7 @@ spec:
- name: KUBERNETES_MODE
value: "yes"
- name: "DATABASE_URI"
value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
---
apiVersion: apps/v1
kind: Deployment
@ -200,6 +200,8 @@ spec:
value: "bunkerweb"
- name: "POSTGRES_PASSWORD"
value: "changeme"
- name: "PGDATA"
value: "/var/lib/postgresql/data/pgdata"
volumeMounts:
- mountPath: "/var/lib/postgresql/data"
name: vol-db
@ -255,4 +257,3 @@ spec:
resources:
requests:
storage: 5Gi
volumeName: pv-bunkerweb

2
src/common/core/clientcache/plugin.json
View File

@ -38,7 +38,7 @@
"help": "Value of the Cache-Control HTTP header.",
"id": "client-cache-control",
"label": "Cache-Control header",
"regex": "^(?!(, ?| ))((, )?(((max-age|s-maxage|stale-while-revalidate|stale-if-error)=\\d+(?!.*\\6))|((?!.*public)private|(?!.*private)public)|(must|proxy)-revalidate|must-understand|immutable|no-(cache|store|transform))(?!.*\\5))+$",
"regex": "^(?!(, ?| ))((, )?(((max-age|s-maxage|stale-while-revalidate|stale-if-error)=\\d+(?!.*\\6))|((?!.*public)private|(?!.*private)public)|(must|proxy)-revalidate|must-understand|immutable|no-(cache|store|transform))(?!.*\\4))+$",
"type": "text"
}
}

8
src/ui/static/css/login.css Normal file
View File

@ -0,0 +1,8 @@
@font-face {
font-family: "Open Sans";
src: url("../webfonts/OpenSans.ttf");
}
* {
font-family: "Open Sans", sans-serif !important;
}

BIN
src/ui/static/webfonts/OpenSans.ttf Normal file
View File

Binary file not shown.

18
src/ui/templates/login.html
View File

@ -8,20 +8,16 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>BunkerWeb UI</title>
<link href="images/favicon.ico" rel="icon" type="image/x-icon" />
<!-- Fonts and icons -->
<link
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700"
rel="stylesheet"
/>
<link rel="stylesheet" href="css/dashboard.css" />
<link rel="stylesheet" href="css/login.css" />
</head>
<body>
<div
data-loader
data-loader
class="fixed z-[10000] transition duration-300 h-screen w-screen bg-primary flex justify-center align-middle items-center"
>
<img
data-loader-img
data-loader-img
src="images/logo-menu-2.png"
class="duration-300 w-40 h-12 sm:w-50 sm:h-14 md:w-60 md:h-16 lg:w-80 lg:h-24 inline transition-all"
alt="main logo"
@ -32,11 +28,11 @@
<!-- flash message-->
{% for category, message in messages %}
<div
data-flash-message
data-flash-message
class="p-4 mb-1 md:mb-3 md:mr-3 z-[1001] flex flex-col fixed bottom-0 right-0 w-full md:w-1/2 max-w-[300px] min-h-20 bg-white rounded-lg dark:brightness-110 hover:scale-102 transition shadow-md break-words dark:bg-slate-850 dark:shadow-dark-xl bg-clip-border"
>
<button
data-close-flash-message
data-close-flash-message
role="close alert message"
type="button"
class="absolute right-7 top-1.5"
@ -221,7 +217,9 @@
window.addEventListener("click", (e) => {
try {
if (
e.target.closest("button").hasAttribute("data-close-flash-message")
e.target
.closest("button")
.hasAttribute("data-close-flash-message")
) {
const closeBtn = e.target.closest("button");
const flashEl = closeBtn.closest("[data-flash-message]");

2
tests/ansible/autoconf_playbook
View File

@ -38,4 +38,4 @@
ansible.builtin.pause:
seconds: 60
- name: Restart GH runner
shell: systemctl restart actions.runner.*
shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*

2
tests/ansible/docker_playbook
View File

@ -38,4 +38,4 @@
ansible.builtin.pause:
seconds: 60
- name: Restart GH runner
shell: systemctl restart actions.runner.*
shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*

2
tests/ansible/linux_playbook
View File

@ -38,4 +38,4 @@
ansible.builtin.pause:
seconds: 60
- name: Restart GH runner
shell: systemctl restart actions.runner.*
shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*

2
tests/ansible/swarm_playbook
View File

@ -49,4 +49,4 @@
ansible.builtin.pause:
seconds: 60
- name: Restart GH runner
shell: systemctl restart actions.runner.*
shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*