.gitignore

@@ -10,4 +10,3 @@ urls.sqlite
 .env
 cookie*
 .idea/
-.DS_Store

Makefile

@@ -24,7 +24,7 @@ docker-test: docker-local docker-stop
 	docker run -p ${PORT}:${PORT} --name chhoto-url -e password="${PASSWORD}" -e public_mode="${PUBLIC_MODE}" \
 		-e site_url="${SITE_URL}" -e db_url="${DB_URL}" -e redirect_method="${REDIRECT_METHOD}" -e port="${PORT}"\
 		-e slug_style="${SLUG_STYLE}" -e slug_length="${SLUG_LENGTH}" -e cache_control_header="${CACHE_CONTROL_HEADER}"\
-		-e api_key="${API_KEY}" -e disable_frontend="${DISABLE_FRONTEND}"\
+		-e api_key="${API_KEY}"\
 		-d chhoto-url
 	docker logs chhoto-url -f
 

README.md

@@ -47,8 +47,7 @@ for small. URL means, well... URL. So the name simply means Small URL.
   i.e. only the hit is recorded, and nothing else.
 - Has a mobile friendly UI, and automatic dark mode.
 - Has a public mode, where anyone can add links without authentication. Deleting 
-  or listing available links will need admin access using the password. It's also 
-  possible to completely disable the frontend.
+  or listing available links will need admin access using the password.
 - Allows setting the URL of your website, in case you want to conveniently
   generate short links locally.
 - Links are stored in an SQLite database.
@@ -147,8 +146,7 @@ the `slug_style` variable to `UID`. You can also set the length of those slug by
 the `slug_length` variable. It defaults to 8, and a minimum of 4 is supported.
 
 To enable public mode, set `public_mode` to `Enable`. With this, anyone will be able to add 
-links. Listing existing links or deleting links will need admin access using the password. To
-completely disable the frontend, set `disable_frontend` to `True`.
+links. Listing existing links or deleting links will need admin access using the password.
 
 By default, the server sends no Cache-Control headers. You can set custom `cache_control_header` 
 to send your desired headers. It must be a comma separated list of valid 
@@ -156,20 +154,6 @@ to send your desired headers. It must be a comma separated list of valid
 you can set it to `no-cache, private` to disable caching. It might help during testing if
 served through a proxy.
 
-## Deploying in your Kubernetes cluster with Helm
-The helm values are very sparse to keep it simple. If you need more values to be variable, feel free to adjust.
-
-The PVC allocates 100Mi and the PV is using a host path volume.
-
-The helm chart assumes you have [cert manager](https://github.com/jetstack/cert-manager) deployed to have TLS certificates managed easily in your cluster. Feel free to remove the issuer and adjust the ingress if you're on AWS with EKS for example. To install cert-manager, I recommend using the ["kubectl apply" way](https://cert-manager.io/docs/installation/kubectl/) to install cert-manager.
-
-To get started, `cp helm-chart/values.yaml helm-chart/my-values.yaml` and adjust `password`, `fqdn` and `letsencryptmail` in your new `my-values.yaml`, then just run
-
-``` bash
-cd helm-chart
-helm upgrade --install chhoto-url . -n chhoto-url --create-namespace -f my-values.yaml
-```
-
 ## Instructions for CLI usage
 The application can be used from the terminal using something like `curl`. In all the examples
 below, replace `http://localhost:4567` with where your instance of `chhoto-url` is accessible.

actix/src/main.rs

@@ -40,8 +40,6 @@ async fn main() -> Result<()> {
         .ok()
         .filter(|s| !s.trim().is_empty());
 
-    let disable_frontend = env::var("disable_frontend").is_ok_and(|s| s.trim() == "True");
-
     // If an API key is set, check the security
     if let Ok(key) = env::var("api_key") {
         if !auth::is_key_secure() {
@@ -84,7 +82,7 @@ async fn main() -> Result<()> {
 
     // Actually start the server
     HttpServer::new(move || {
-        let mut app = App::new()
+        App::new()
             .wrap(middleware::Logger::default())
             .wrap(middleware::Compress::default())
             .wrap(
@@ -110,13 +108,9 @@ async fn main() -> Result<()> {
             .service(services::delete_link)
             .service(services::login)
             .service(services::logout)
-            .service(services::expand);
-
-        if !disable_frontend {
-            app = app.service(Files::new("/", "./resources/").index_file("index.html"));
-        }
-
-        app.default_service(actix_web::web::get().to(services::error404))
+            .service(services::expand)
+            .service(Files::new("/", "./resources/").index_file("index.html"))
+            .default_service(actix_web::web::get().to(services::error404))
     })
     // Hardcode the port the server listens to. Allows for more intuitive Docker Compose port management
     .bind(("0.0.0.0", port))?

actix/src/services.rs

@@ -79,9 +79,9 @@ pub async fn add_link(
             // Return http://
             if port == 80 {
                 url = env::var("site_url")
-                    .ok()
-                    .filter(|s| !s.trim().is_empty())
-                    .unwrap_or(String::from("http://localhost"));
+                        .ok()
+                        .filter(|s| !s.trim().is_empty())
+                        .unwrap_or(String::from("http://localhost"));
             }
             // If the port is 443, remove the port from the returned URL (better for copying and pasting)
             // Return https://

compose.yaml

@@ -59,9 +59,6 @@ services:
             # In case you want to provide public access to adding links (and not 
             # delete, or listing), change the following option to Enable.
             # - public_mode=Disable
-            # In case you want to completely disable the frontend, change the following
-            # to True.
-            # - disable_frontend=False
             
             # By default, the server sends no Cache-Control headers. You can supply a 
             # comma separated list of valid header as per RFC 7234 §5.2 to send those

helm-chart/Chart.yaml

@@ -1,24 +0,0 @@
-apiVersion: v2
-name: chhoto-url
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"

helm-chart/templates/ingress.yml

@@ -1,23 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: chhoto-url
-  annotations:
-    cert-manager.io/issuer: "letsencrypt"
-    acme.cert-manager.io/http01-edit-in-place: "true"
-spec:
-  tls:
-    - hosts:
-      - {{ .Values.fqdn }}
-      secretName: my-tls
-  rules:
-  - host: {{ .Values.fqdn }}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: chhoto-url
-            port:
-              number: 80

helm-chart/templates/issuer.yml

@@ -1,18 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: letsencrypt
-spec:
-  acme:
-    # The ACME server URL
-    server: https://acme-v02.api.letsencrypt.org/directory
-    # Email address used for ACME registration
-    email: {{ .Values.letsencryptmail }}
-    # Name of a secret used to store the ACME account private key
-    privateKeySecretRef:
-      name: letsencrypt
-    # Enable the HTTP-01 challenge provider
-    solvers:
-      - http01:
-          ingress:
-            ingressClassName: nginx

helm-chart/templates/pv.yml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: chhoto-pv
-  labels:
-    app: chhoto-url
-spec:
-  capacity:
-    storage: 100Mi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: {{ .Values.persistence.hostPath.path }}

helm-chart/templates/secret.yml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: secret
-type: Opaque
-data:
-  password: {{ .Values.password }}
-  {{- if .Values.api_key }}
-  api_key: {{ .Values.api_key }}
-  {{- end }}

helm-chart/templates/sts.yml

@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: chhoto-url
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: chhoto-url
-  template:
-    metadata:
-      labels:
-        app: chhoto-url
-    spec:
-      containers:
-        - name: chhoto-url
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          ports:
-            - containerPort: 4567
-          env:
-            - name: password
-              valueFrom:
-                secretKeyRef:
-                  name: secret
-                  key: password
-            {{- if .Values.api_key }}
-            - name: api_key
-              valueFrom:
-                secretKeyRef:
-                  name: secret
-                  key: api_key
-            {{- end }}
-            - name: db_url
-              value: /db/urls.sqlite
-            - name: site_url
-              value: "{{ .Values.protocol }}://{{ .Values.fqdn }}"
-            - name: redirect_method
-              value: {{ .Values.redirect_method }}
-            - name: slug_style
-              value: {{ .Values.slug_style }}
-            - name: slug_length
-              value: "{{ .Values.slug_length }}"
-            - name: public_mode
-              value: {{ .Values.public_mode }}
-            - name: disable_frontend
-              value: {{ .Values.disable_frontend }}
-            {{- if .Values.cache_control_header }}
-            - name: cache_control_header
-              value: {{ .Values.cache_control_header }}
-            {{- end }}
-          volumeMounts:
-            - name: data
-              mountPath: /db
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      spec:
-        accessModes: [ "ReadWriteOnce" ]
-        resources:
-          requests:
-            storage: 100Mi

helm-chart/templates/svc.yml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: chhoto-url
-  labels:
-    app: chhoto-url
-spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: 4567
-      protocol: TCP
-  selector:
-    app: chhoto-url

helm-chart/values.yaml

@@ -1,28 +0,0 @@
-# Default values for chhoto-url.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-image:
-  repository: sintan1729/chhoto-url
-  pullPolicy: IfNotPresent
-  tag: "5.4.6"
-
-# please use a better password in your values and base64 encode it
-password: cGFzc3dvcmQ=
-# if used, needs to be base64 encoded as well
-# api_key: U0VDVVJFX0FQSV9LRVk=
-
-persistence:
-  hostPath:
-    path: /mnt/data/chhoto-data
-
-redirect_method: PERMANENT
-slug_style: Pair
-slug_length: 8
-public_mode: Disable
-disable_frontend: False
-# cache_control_header: "no-cache, private"
-
-protocol: https
-fqdn: your.short.link.url.com
-letsencryptmail: your.mail@address.com