zfs-mirror-kali-http

Reviewed-on: #1

Manifests/Mirror/CronJobs/almalinux.yml

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

Manifests/Mirror/CronJobs/arch.yml

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

Manifests/Mirror/CronJobs/fedora-epel.yml

@@ -13,23 +13,23 @@ spec:
       template:
         spec:
           containers:
-          - name: mirrorupdate-epel
-            imagePullPolicy: Always
-            image: ghcr.io/0xemma/mirror-updater:v2.0.0
-            env:
-              - name: TARGET
-                value: /ext/mirror/epel
-              - name: SOURCE
-                value: rsync://mirrors.rit.edu/epel
-              - name: LASTUPDATE
-                value: http://rsync.repo.epel.org/epel/timestamp.txt
-              - name: FIRST
-                value: "no"
-            volumeMounts:
-            - name:  mirror-pvc
-              mountPath:  /ext/mirror/
+            - name: mirrorupdate-epel
+              imagePullPolicy: Always
+              image: ghcr.io/0xemma/mirror-updater:v2.0.0
+              env:
+                - name: TARGET
+                  value: /ext/mirror/epel
+                - name: SOURCE
+                  value: rsync://mirrors.rit.edu/epel
+                - name: LASTUPDATE
+                  value: http://rsync.repo.epel.org/epel/timestamp.txt
+                - name: FIRST
+                  value: "no"
+              volumeMounts:
+                - name: mirror-pvc
+                  mountPath: /ext/mirror/
           restartPolicy: OnFailure
           volumes:
             - name: mirror-pvc
               persistentVolumeClaim:
-                claimName: mirror-truenas
+                claimName: zfs-mirror-bulk

Manifests/Mirror/CronJobs/kali-images.yml

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

Manifests/Mirror/CronJobs/parrot.yaml

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

Manifests/Mirror/CronJobs/rockylinux.yml

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

Manifests/Mirror/CronJobs/torproject.yml

@@ -0,0 +1,35 @@
+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

Manifests/Mirror/CronJobs/ubuntu.yml

@@ -13,23 +13,23 @@ spec:
       template:
         spec:
           containers:
-          - name: mirrorupdate-ubuntu
-            imagePullPolicy: Always
-            image: ghcr.io/0xemma/mirror-updater:v2.0.0
-            env:
-              - name: TARGET
-                value: /ext/mirror/ubuntu
-              - name: SOURCE
-                value: rsync://archive.ubuntu.com/ubuntu
-              - name: LASTUPDATE
-                value: https://mirror.math.princeton.edu/pub/blackarch/lastupdate
-              - name: FIRST
-                value: "not"
-            volumeMounts:
-            - name:  mirror-pvc
-              mountPath:  /ext/mirror/
+            - name: mirrorupdate-ubuntu
+              imagePullPolicy: Always
+              image: ghcr.io/0xemma/mirror-updater:v2.0.0
+              env:
+                - name: TARGET
+                  value: /ext/mirror/ubuntu
+                - name: SOURCE
+                  value: rsync://archive.ubuntu.com/ubuntu
+                - name: LASTUPDATE
+                  value: https://mirror.math.princeton.edu/pub/blackarch/lastupdate
+                - name: FIRST
+                  value: "not"
+              volumeMounts:
+                - name: mirror-pvc
+                  mountPath: /ext/mirror/
           restartPolicy: OnFailure
           volumes:
             - name: mirror-pvc
               persistentVolumeClaim:
-                claimName: mirror-truenas
+                claimName: zfs-mirror-bulk

Manifests/Mirror/CronJobs/voidlinux.yml

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

Manifests/Mirror/Mirror-Rsync/mirror-rsync-config.yml

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

Manifests/Mirror/Mirror-Rsync/mirror-rsync-svc.yml

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

Manifests/Mirror/Mirror-Rsync/mirror-rsync.yml

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

Manifests/Mirror/Mirror-Web/Mainpage/mirror-deployment.yml

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

Manifests/Mirror/Mirror-Web/almalinux/web.yaml

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

Manifests/Mirror/Mirror-Web/arch/ingress.yml

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

Manifests/Mirror/Mirror-Web/arch/pvc.yaml

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

Manifests/Mirror/Mirror-Web/arch/svc.yml

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

Manifests/Mirror/Mirror-Web/arch/web.yaml

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

Manifests/Mirror/Mirror-Web/epel/web.yaml

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

Manifests/Mirror/Mirror-Web/kali-iso/pvc.yaml

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

Manifests/Mirror/Mirror-Web/kali-iso/web.yaml

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

Manifests/Mirror/Mirror-Web/kali/pvc.yaml

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

Manifests/Mirror/Mirror-Web/kali/web.yaml

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

Manifests/Mirror/Mirror-Web/parrot/web.yaml

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

Manifests/Mirror/Mirror-Web/rockylinux/ingress.yml

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

Manifests/Mirror/Mirror-Web/rockylinux/pvc.yaml

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

Manifests/Mirror/Mirror-Web/rockylinux/svc.yml

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

Manifests/Mirror/Mirror-Web/rockylinux/web.yaml

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

Manifests/Mirror/Mirror-Web/torproject/ingress.yml

@@ -0,0 +1,31 @@
+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

Manifests/Mirror/Mirror-Web/torproject/pvc.yaml

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

Manifests/Mirror/Mirror-Web/torproject/svc.yml

@@ -0,0 +1,13 @@
+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

Manifests/Mirror/Mirror-Web/torproject/web.yaml

@@ -0,0 +1,59 @@
+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

Manifests/Mirror/Mirror-Web/ubuntu/web.yaml

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

Manifests/Mirror/Mirror-Web/voidlinux/web.yaml

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

Manifests/Mirror/mirror-pvc.yml

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