Compare commits

..

No commits in common. "main" and "0xemma-patch-1" have entirely different histories.

35 changed files with 125 additions and 279 deletions

View File

@ -32,4 +32,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-almalinux claimName: mirror-almalinux-zfs

View File

@ -32,4 +32,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-arch claimName: mirror-arch

View File

@ -32,4 +32,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-bulk claimName: mirror-truenas

View File

@ -32,4 +32,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-kali-images claimName: mirror-kali-images

View File

@ -25,4 +25,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-parrot claimName: mirror-parrot-zfs

View File

@ -32,4 +32,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-rockylinux claimName: mirror-rockylinux

View File

@ -1,35 +0,0 @@
apiVersion: batch/v1
kind: CronJob
metadata:
name: mirrorupdate-torproject
namespace: default
spec:
schedule: "35 */6 * * *"
successfulJobsHistoryLimit: 0
failedJobsHistoryLimit: 0
concurrencyPolicy: Forbid
jobTemplate:
spec:
template:
spec:
containers:
- name: mirrorupdate-torproject
imagePullPolicy: Always
image: ghcr.io/0xemma/mirror-updater:v2.0.0
env:
- name: TARGET
value: /ext/mirror/
- name: SOURCE
value: rsync://rsync.torproject.org/website-mirror/
- name: LASTUPDATE
value: http://rsync.repo.torproject.org/torproject/timestamp.txt
- name: FIRST
value: "no"
volumeMounts:
- name: mirror-pvc
mountPath: /ext/mirror/
restartPolicy: OnFailure
volumes:
- name: mirror-pvc
persistentVolumeClaim:
claimName: mirror-torproject

View File

@ -32,4 +32,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-bulk claimName: mirror-truenas

View File

@ -32,4 +32,4 @@
# volumes: # volumes:
# - name: mirror-pvc # - name: mirror-pvc
# persistentVolumeClaim: # persistentVolumeClaim:
# claimName: zfs-mirror-bulk # claimName: mirror-truenas

View File

@ -42,4 +42,4 @@ data:
[void] [void]
path = /mirror/voidlinux path = /mirror/voidlinux
[rockylinux] [rockylinux]
path = /mnt/rockylinux/rockylinux path = /mnt/rockylinux

View File

@ -3,8 +3,6 @@ kind: Service
metadata: metadata:
name: mirror-rsync name: mirror-rsync
namespace: default namespace: default
annotations:
metallb.universe.tf/loadBalancerIPs: 10.69.42.7
spec: spec:
selector: selector:
app: mirror-rsync app: mirror-rsync

View File

@ -26,7 +26,7 @@ spec:
# - Each init container must complete successfully before the next one starts. # - Each init container must complete successfully before the next one starts.
containers: containers:
- name: mirror-rsync - name: mirror-rsync
image: ghcr.io/0xemma/rsync-daemon-docker:v1 image: ghcr.io/0xemma/rsync-daemon-docker:v0.0.2
resources: resources:
requests: requests:
cpu: 100m cpu: 100m
@ -64,29 +64,29 @@ spec:
name: rsync-config name: rsync-config
- name: mirror - name: mirror
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-bulk claimName: mirror-truenas
- name: ubuntu-iso - name: ubuntu-iso
persistentVolumeClaim: persistentVolumeClaim:
claimName: mirror-ubuntu-iso claimName: mirror-ubuntu-iso
- name: kali-iso - name: kali-iso
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-kali-images claimName: mirror-kali-images
- name: arch - name: arch
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-arch claimName: mirror-arch
- name: alma - name: alma
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-almalinux claimName: mirror-almalinux-zfs
- name: parrot - name: parrot
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-parrot claimName: mirror-parrot-zfs
- name: kali - name: kali
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-kali-http claimName: mirror-kali
- name: blackarch - name: blackarch
persistentVolumeClaim: persistentVolumeClaim:
claimName: mirror-blackarch-zfs claimName: mirror-blackarch-zfs
- name: rockylinux - name: rockylinux
persistentVolumeClaim: persistentVolumeClim:
claimName: zfs-mirror-rockylinux claimName: mirror-rockylinux
restartPolicy: Always restartPolicy: Always

View File

@ -23,7 +23,7 @@ spec:
spec: spec:
containers: containers:
- name: mirror - name: mirror
image: ghcr.io/0xemma/mirror-main:v1.0.2 image: ghcr.io/0xemma/mirror-main:v1.0.0
resources: resources:
limits: limits:
memory: 800Mi memory: 800Mi

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-almalinux claimName: mirror-almalinux-zfs

View File

@ -9,7 +9,7 @@ spec:
- match: Host(`mirror.0xem.ma`) && PathPrefix(`/arch`) - match: Host(`mirror.0xem.ma`) && PathPrefix(`/arch`)
kind: Rule kind: Rule
services: services:
- name: zfs-mirror-arch - name: mirror-arch
kind: Service kind: Service
port: 80 port: 80
tls: tls:
@ -26,6 +26,6 @@ spec:
- match: Host(`mirror.0xem.ma`) && PathPrefix(`/arch`) - match: Host(`mirror.0xem.ma`) && PathPrefix(`/arch`)
kind: Rule kind: Rule
services: services:
- name: zfs-mirror-arch - name: mirror-arch
kind: Service kind: Service
port: 80 port: 80

View File

@ -1,13 +1,13 @@
# apiVersion: v1 apiVersion: v1
# kind: PersistentVolumeClaim kind: PersistentVolumeClaim
# metadata: metadata:
# name: zfs-mirror-arch name: mirror-arch
# namespace: default namespace: default
# labels: labels:
# app: zfs-mirror-arch app: mirror-arch
# spec: spec:
# accessModes: accessModes:
# - ReadWriteMany - ReadWriteMany
# resources: resources:
# requests: requests:
# storage: 150Gi storage: 150Gi

View File

@ -1,13 +1,13 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: zfs-mirror-arch name: mirror-arch
namespace: default namespace: default
spec: spec:
selector: selector:
app: zfs-mirror-arch app: mirror-arch
ports: ports:
- name: zfs-mirror-arch - name: mirror-arch
protocol: TCP protocol: TCP
port: 80 port: 80
targetPort: 80 targetPort: 80

View File

@ -1,10 +1,10 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: zfs-mirror-arch name: mirror-arch
namespace: default namespace: default
labels: labels:
app: zfs-mirror-arch app: mirror-arch
id: mirror-web id: mirror-web
annotations: annotations:
operator.1password.io/auto-restart: "true" operator.1password.io/auto-restart: "true"
@ -12,7 +12,7 @@ spec:
revisionHistoryLimit: 2 revisionHistoryLimit: 2
selector: selector:
matchLabels: matchLabels:
app: zfs-mirror-arch app: mirror-arch
replicas: 2 replicas: 2
strategy: strategy:
rollingUpdate: rollingUpdate:
@ -22,11 +22,11 @@ spec:
template: template:
metadata: metadata:
labels: labels:
app: zfs-mirror-arch app: mirror-arch
id: mirror-web id: mirror-web
spec: spec:
containers: containers:
- name: zfs-mirror-arch - name: mirror-arch
image: 0xemma/nginx-autoindex:json-4 image: 0xemma/nginx-autoindex:json-4
resources: resources:
limits: limits:
@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-arch claimName: mirror-arch

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-bulk claimName: mirror-truenas

View File

@ -1,13 +1,13 @@
# apiVersion: v1 apiVersion: v1
# kind: PersistentVolumeClaim kind: PersistentVolumeClaim
# metadata: metadata:
# name: mirror-kali-images name: mirror-kali-images
# namespace: default namespace: default
# labels: labels:
# app: mirror-kali-images app: mirror-kali-images
# spec: spec:
# accessModes: accessModes:
# - ReadWriteMany - ReadWriteMany
# resources: resources:
# requests: requests:
# storage: 250Gi storage: 250Gi

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-kali-images claimName: mirror-kali-images

View File

@ -10,4 +10,4 @@ spec:
- ReadWriteMany - ReadWriteMany
resources: resources:
requests: requests:
storage: 1000Gi storage: 700Gi

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-kali-http claimName: mirror-kali

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-parrot claimName: mirror-parrot-zfs

View File

@ -9,7 +9,7 @@ spec:
- match: Host(`mirror.0xem.ma`) && PathPrefix(`/rockylinux`) - match: Host(`mirror.0xem.ma`) && PathPrefix(`/rockylinux`)
kind: Rule kind: Rule
services: services:
- name: zfs-mirror-rockylinux - name: mirror-rockylinux
kind: Service kind: Service
port: 80 port: 80
tls: tls:
@ -26,6 +26,6 @@ spec:
- match: Host(`mirror.0xem.ma`) && PathPrefix(`/rockylinux`) - match: Host(`mirror.0xem.ma`) && PathPrefix(`/rockylinux`)
kind: Rule kind: Rule
services: services:
- name: zfs-mirror-rockylinux - name: mirror-rockylinux
kind: Service kind: Service
port: 80 port: 80

View File

@ -1,12 +1,12 @@
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
name: zfs-mirror-rockylinux name: mirror-rockylinux
namespace: default namespace: default
labels: labels:
app: zfs-mirror-rockylinux app: mirror-rockylinux
spec: spec:
storageClassName: zfs-mirror storageClassName: csi-fs-hdd-sc
accessModes: accessModes:
- ReadWriteMany - ReadWriteMany
resources: resources:

View File

@ -1,13 +1,13 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: zfs-mirror-rockylinux name: mirror-rockylinux
namespace: default namespace: default
spec: spec:
selector: selector:
app: zfs-mirror-rockylinux app: mirror-rockylinux
ports: ports:
- name: zfs-mirror-rockylinux - name: mirror-rockylinux
protocol: TCP protocol: TCP
port: 80 port: 80
targetPort: 80 targetPort: 80

View File

@ -1,10 +1,10 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: zfs-mirror-rockylinux name: mirror-rockylinux
namespace: default namespace: default
labels: labels:
app: zfs-mirror-rockylinux app: mirror-rockylinux
id: mirror-web id: mirror-web
annotations: annotations:
operator.1password.io/auto-restart: "true" operator.1password.io/auto-restart: "true"
@ -12,7 +12,7 @@ spec:
revisionHistoryLimit: 2 revisionHistoryLimit: 2
selector: selector:
matchLabels: matchLabels:
app: zfs-mirror-rockylinux app: mirror-rockylinux
replicas: 2 replicas: 2
strategy: strategy:
rollingUpdate: rollingUpdate:
@ -22,11 +22,11 @@ spec:
template: template:
metadata: metadata:
labels: labels:
app: zfs-mirror-rockylinux app: mirror-rockylinux
id: mirror-web id: mirror-web
spec: spec:
containers: containers:
- name: zfs-mirror-rockylinux - name: mirror-rockylinux
image: 0xemma/nginx-autoindex:json-4 image: 0xemma/nginx-autoindex:json-4
resources: resources:
limits: limits:
@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-rockylinux claimName: mirror-rockylinux

View File

@ -1,31 +0,0 @@
apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: mirror-ingress-tls-torproject
spec:
entryPoints:
- websecure
routes:
- match: Host(`tor.0xem.ma`)
kind: Rule
services:
- name: mirror-torproject
kind: Service
port: 80
tls:
secretName: emma-tls
---
apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: mirror-ingress-torproject
spec:
entryPoints:
- web
routes:
- match: Host(`tor.0xem.ma`)
kind: Rule
services:
- name: mirror-torproject
kind: Service
port: 80

View File

@ -1,14 +0,0 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mirror-torproject
namespace: default
labels:
app: torproject
backup: donot
spec:
accessModes:
- ReadWriteMany
resources:
requests:
storage: 40Gi

View File

@ -1,13 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: mirror-torproject
namespace: default
spec:
selector:
app: mirror-torproject
ports:
- name: mirror-torproject
protocol: TCP
port: 80
targetPort: 80

View File

@ -1,59 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: mirror-torproject
namespace: default
labels:
app: mirror-torproject
id: mirror-web
annotations:
operator.1password.io/auto-restart: "true"
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
app: mirror-torproject
replicas: 2
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
app: mirror-torproject
id: mirror-web
spec:
containers:
- name: mirror-torproject
image: 0xemma/nginx-autoindex:json-4
resources:
limits:
memory: 8000Mi
requests:
cpu: 100m
memory: 8000Mi
env:
- name: API_KEY
valueFrom:
secretKeyRef:
key: AMPLIFY_API_KEY
name: amplify-secret
- name: AMPLIFY_IMAGENAME
value: "torproject"
volumeMounts:
- mountPath: /var/lib/nginx/html
name: mirror-pvc
ports:
- containerPort: 80
readinessProbe:
httpGet:
path: /
port: 80
initialDelaySeconds: 5
periodSeconds: 10
volumes:
- name: mirror-pvc
persistentVolumeClaim:
claimName: mirror-torproject

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-bulk claimName: mirror-truenas

View File

@ -56,4 +56,4 @@ spec:
volumes: volumes:
- name: mirror-pvc - name: mirror-pvc
persistentVolumeClaim: persistentVolumeClaim:
claimName: zfs-mirror-bulk claimName: mirror-truenas

View File

@ -1,14 +1,14 @@
# apiVersion: v1 apiVersion: v1
# kind: PersistentVolumeClaim kind: PersistentVolumeClaim
# metadata: metadata:
# name: zfs-mirror-bulk name: mirror-truenas
# namespace: default namespace: default
# labels: labels:
# app: zfs-mirror-bulk app: mirror-truenas
# spec: spec:
# accessModes: accessModes:
# - ReadWriteMany - ReadWriteMany
# resources: resources:
# requests: requests:
# storage: 11000Gi storage: 11000Gi
# # storageClassName: freenas-nfs-csi # storageClassName: freenas-nfs-csi