diff --git a/.gitignore b/.gitignore index ebda3ac..2c5f973 100644 --- a/.gitignore +++ b/.gitignore @@ -104,5 +104,6 @@ temp/* */k8s/*secret* !*/k8s/*secret*.example traefik/k8s/local-tls.yaml +converters/k8s/config.yaml convertx/k8s/config.yaml traefik/k8s/crowdsec-middleware.yaml diff --git a/converters/.env.example b/converters/.env.example new file mode 100644 index 0000000..b451193 --- /dev/null +++ b/converters/.env.example @@ -0,0 +1,9 @@ +ACCOUNT_REGISTRATION=false +HTTP_ALLOWED=false +ALLOW_UNAUTHENTICAED=false +AUTO_DELETE_EVERY_N_HOURS=24 +WEBROOT=/convert +HIDE_HISTORY=false +LANGUAGE=en +UNAUTHED_USER_SHARING=false +MAX_CONVERT_PROCESS=0 \ No newline at end of file diff --git a/convertx/compose.yaml b/converters/compose.yaml similarity index 63% rename from convertx/compose.yaml rename to converters/compose.yaml index ce24040..72bff78 100644 --- a/convertx/compose.yaml +++ b/converters/compose.yaml @@ -39,6 +39,29 @@ services: - proxy volumes: - data:/app/data + + bentopdf: + container_name: bentopdf + image: bentopdf/bentopdf:latest + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.services.bentopdf.loadbalancer.server.port=8080" + # Prod router + - "traefik.http.routers.bentopdf.rule=(Host(`forust.xyz`) || Host(www.forust.xyz)) && PathPrefix(`pdf-tools`)" + - "traefik.http.routers.bentopdf.entrypoints=websecure" + - "traefik.http.routers.bentopdf.tls.certresolver=letsencrypt" + - "traefik.http.routers.bentopdf.tls=true" + # Local router + - "traefik.http.routers.bentopdf-local.rule=Host(`workstation.internal`) && PathPrefix(`pdf-tools`)" + - "traefik.http.routers.bentopdf-local.entrypoints=websecure" + - "traefik.http.routers.bentopdf-local.tls=true" + # Prod router + - "traefik.http.routers.bentopdf-dev.rule=Host(`gigaforust.internal`) && PathPrefix(`pdf-tools`)" + - "traefik.http.routers.bentopdf-dev.entrypoints=websecure" + - "traefik.http.routers.bentopdf-dev.tls=true" + networks: + - proxy networks: proxy: external: true diff --git a/convertx/k8s/config.yaml.example b/converters/k8s/config.yaml.example similarity index 93% rename from convertx/k8s/config.yaml.example rename to converters/k8s/config.yaml.example index 9e812c3..9255743 100644 --- a/convertx/k8s/config.yaml.example +++ b/converters/k8s/config.yaml.example @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: convertx-config - namespace: convertx + namespace: converters data: ACCOUNT_REGISTRATION: "false" HTTP_ALLOWED: "false" diff --git a/convertx/k8s/convertx.yaml b/converters/k8s/convertx.yaml similarity index 94% rename from convertx/k8s/convertx.yaml rename to converters/k8s/convertx.yaml index ab65b03..db9aade 100644 --- a/convertx/k8s/convertx.yaml +++ b/converters/k8s/convertx.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: convertx-service - namespace: convertx + namespace: converters spec: selector: app: convertx @@ -14,7 +14,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: convertx-deployment - namespace: convertx + namespace: converters spec: replicas: 1 selector: @@ -54,7 +54,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: convertx-pvc - namespace: convertx + namespace: converters spec: accessModes: - ReadWriteOnce diff --git a/convertx/k8s/ingress.yaml b/converters/k8s/ingress.yaml similarity index 93% rename from convertx/k8s/ingress.yaml rename to converters/k8s/ingress.yaml index 353faa0..26cc43b 100644 --- a/convertx/k8s/ingress.yaml +++ b/converters/k8s/ingress.yaml @@ -2,7 +2,7 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: convertx-prod - namespace: convertx + namespace: converters spec: entryPoints: - websecure @@ -20,7 +20,7 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: convertx-local - namespace: convertx + namespace: converters spec: entryPoints: - websecure diff --git a/convertx/k8s/namespace.yaml b/converters/k8s/namespace.yaml similarity index 68% rename from convertx/k8s/namespace.yaml rename to converters/k8s/namespace.yaml index 7c16137..68c8cdf 100644 --- a/convertx/k8s/namespace.yaml +++ b/converters/k8s/namespace.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: convertx + name: converters diff --git a/convertx/k8s/secrets.yaml.example b/converters/k8s/secrets.yaml.example similarity index 100% rename from convertx/k8s/secrets.yaml.example rename to converters/k8s/secrets.yaml.example