Feat: re-add default configs

.github/workflows/docker-image.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - master
 
+steps:
+  - name: Install Trivy
+    uses: aquasecurity/[email protected]
+
 jobs:
   build:
     runs-on: ubuntu-latest

Dockerfile

@@ -14,6 +14,9 @@ ENV BITLBEE_HOME=/usr/local/etc/bitlbee
 COPY build.sh /root/
 RUN chmod +x /root/build.sh && /root/build.sh
 
+COPY etc/bitlbee/bitlbee.conf /usr/local/etc/bitlbee/bitlbee.conf
+COPY etc/bitlbee/motd.txt /usr/local/etc/bitlbee/motd.txt
+
 # Define volumes for persistent data
 VOLUME ["/usr/local/etc/bitlbee"]
 

README.md

@@ -16,40 +16,41 @@ This repository contains a Docker container for [BitlBee](https://www.bitlbee.or
 
 ## Usage via Docker
 
-1. Start `bitlbee` via [Docker Compose](https://docs.docker.com/compose/install/):
+1. Configuration (optional):
+
+If you want to configure BitlBee you can do so by editing the configuration files by accessing the container or volume mounted at `bitlbee_data` (/usr/local/etc/bitlbee.conf).
+
+
+2. Start `bitlbee` via [Docker Compose](https://docs.docker.com/compose/install/):
 
 ```
 docker-compose up -d
 ```
 
-2. Configuration (optional):
-
-If you want to configure BitlBee you can do so by editing the configuration files by accessing the container or volume mounted at `bitlbee_data` (/usr/local/etc/bitlbee.conf).
-
 3. Connect your IRC client either to:
 
     * localhost:16697 (TLS terminated via stunnel) (recommended)
     * localhost:16667 (non-TLS, plain connection)
 
 ## Usage via Kubernetes
 
-1. Create the Deployment:
+1. Configuration:
+
+Create the ConfigMap to hold the configuration for BitlBee:
 
 ```
-kubectl apply -f k8s/bitlbee-deployment.yaml
+kubectl apply -f k8s/bitlbee-configmap.yaml
 ```
 
-NOTE: If you are using ClusterIP, BitlBee will be accessible internally within the Kubernetes cluster. If you need external access, you can modify the service type to NodePort or LoadBalancer.
-
+If you want to further configure BitlBee you can do so by modifing the ConfigMap.
 
-2. Configuration (optional):
-
-If you want to configure BitlBee you can do so by configuring the ConfigMap stored in k8s/bitlbee-config.yaml and then create it:
+2. Create the Deployment:
 
 ```
-kubectl apply -f k8s/bitlbee-configmap.yaml
+kubectl apply -f k8s/bitlbee-deployment.yaml
 ```
 
+NOTE: If you are using ClusterIP, BitlBee will be accessible internally within the Kubernetes cluster. If you need external access, you can modify the service type to NodePort or LoadBalancer.
 
 ## Building the Container
 

build.sh

@@ -74,7 +74,7 @@ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 # Remove temporary files and downloaded sources
 echo "Removing temporary files..."
 rm -fr /root/build.sh
-rm -fr $BITLBEE_VERSION*
+rm -fr bitlbee-$BITLBEE_VERSION*
 rm -fr 1.7.tar.gz skype4pidgin-*
 rm -fr tdlib-purple*
 rm -fr v1.2.2.tar.gz bitlbee-facebook-*

etc/bitlbee/bitlbee.conf

@@ -0,0 +1,2 @@
+[settings]
+[defaults]

etc/bitlbee/motd.txt

@@ -0,0 +1,16 @@
+Welcome to the BitlBee server at %h.
+
+This server is running BitlBee version %v.
+The newest version can be found on http://www.bitlbee.org/
+
+You are getting this message because the server administrator has not
+yet had the time (or need) to change it.
+
+For those who don't know it yet, this is not quite a regular Internet
+Relay Chat server. Please see the site mentioned above for more
+information.
+
+The developers of the Bee hope you have a buzzing time.
+-- BitlBee development team.
+
+... Buzzing, haha, get it?

k8s/bitlbee-config.yaml

@@ -5,6 +5,21 @@ metadata:
 data:
   bitlbee.conf: |
     [settings]
-    # ...
     [defaults]
-    # ...
+  motd.txt: |
+    Welcome to the BitlBee server at %h.
+
+    This server is running BitlBee version %v.
+    The newest version can be found on http://www.bitlbee.org/
+
+    You are getting this message because the server administrator has not
+    yet had the time (or need) to change it.
+
+    For those who don't know it yet, this is not quite a regular Internet
+    Relay Chat server. Please see the site mentioned above for more
+    information.
+
+    The developers of the Bee hope you have a buzzing time.
+    -- BitlBee development team.
+
+    ... Buzzing, haha, get it?