2023-11-18 16:20:35 +01:00
6 changed files with 5 additions and 92 deletions
--- a/CT-Build/Debian.Jenkinsfile
+++ b/CT-Build/Debian.Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
        string defaultValue: '192.168.200.11', description: 'Proxy server for packages, when enabled', name: 'ProxyServer'
        booleanParam description: 'will disable use of proxy server', name: 'DisProxy'
        checkboxParameter(name: 'ImgVariantList', format: 'JSON', displayNodePath: "//Variants/Variant", valueNodePath: "//Variants/Variant", description: 'Select the variant(s) that should be build',
-            pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "jenkinsbuilder"},{"Variant": "imgbuilder"},{"Variant": "jenkins"},{"Variant": "mysql"},{"Variant": "pihole"},{"Variant": "collabora"},{"Variant": "jellyfin"},{"Variant": "domoticz"},{"Variant": "omadaV3"},{"Variant": "docker"},{"Variant": "smb"},{"Variant": "x2go"},{"Variant": "aptcacherng"},{"Variant": "elkarbackupDEB"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"}]}')
+            pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "jenkinsbuilder"},{"Variant": "imgbuilder"},{"Variant": "jenkins"},{"Variant": "mysql"},{"Variant": "pihole"},{"Variant": "collabora"},{"Variant": "jellyfin"},{"Variant": "domoticz"},{"Variant": "omadaV3"},{"Variant": "docker"},{"Variant": "smb"},{"Variant": "x2go"},{"Variant": "aptcacherng"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"}]}')
    }
    options {
        skipDefaultCheckout()
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -1164,13 +1164,6 @@ files:
  variants:
  - aptcacherng

-#FileForElkarbackup
- path: /opt/Setup
-  generator: copy
-  source: CT-Files/elkarbackupDEB
-  variants:
-  - elkarbackupDEB
-
 #FileForNFS
 - path: /opt/Setup
  generator: copy
@@ -1220,7 +1213,6 @@ packages:
    - smb
    - x2go
    - aptcacherng
-    - elkarbackupDEB
    - nfs
    - duplicati
    - fileshelter
@@ -1479,15 +1471,6 @@ packages:
    variants:
    - aptcacherng

-#elkarbackupDEB pkgs    
-  - packages:
-    - nano
-    - cron
-    - ssl-cert
-    action: install
-    variants:
-    - elkarbackupDEB
-
 #NFS pkgs    
  - packages:
    - nfs-kernel-server
@@ -1611,13 +1594,6 @@ packages:
    variants:
    - x2go

-#Elkarbackup Repo
-  - name: elkarbackup.list
-    url: |-
-      deb [signed-by=/usr/share/keyrings/elkarbackup-archive-keyring.gpg arch=amd64] http://elkarbackup.org/apt/debian {{ image.release }} main
-    variants:
-    - elkarbackupDEB
-
 ##Mono Repo (Disabled, Debain repo version compatible)
 #  - name: mono.list
 #    url: |-
@@ -1626,7 +1602,7 @@ packages:
 #    - duplicati

 #FileShelter Repo
-  - name: elkarbackup.list
+  - name: FileShelter.list
    url: |-
      deb [signed-by=/usr/share/keyrings/fileshelter-keyring.gpg] https://debian.poupon.dev/apt/debian {{ image.release }} main
    variants:
@@ -1683,7 +1659,6 @@ actions:
  - smb
  - x2go
  - aptcacherng
-  - elkarbackupDEB
  - nfs
  - duplicati
  - fileshelter
@@ -1791,14 +1766,6 @@ actions:
  variants:
  - x2go

-#ElkarBackup Repo key
- trigger: post-unpack
-  action: |-
-    #!/bin/sh
-    curl --retry 7 --retry-delay 5 -L -s http://elkarbackup.org/apt/archive.gpg.key | gpg --dearmor > /usr/share/keyrings/elkarbackup-archive-keyring.gpg
-  variants:
-  - elkarbackupDEB
-
 ##Mono Repo key (Disabled since repo is not in use)
 #- trigger: post-unpack
 #  action: |-
--- a/CT-Files/elkarbackupDEB/Configs/elkarbackupconf.yaml
+++ b/CT-Files/elkarbackupDEB/Configs/elkarbackupconf.yaml
@@ -1,27 +0,0 @@
-parameters:
-    database_driver: pdo_mysql
-    database_host: DBServer
-    database_port: null
-    database_name: DBName
-    database_user: DBUser
-    database_password: DBPass
-    mailer_transport: smtp
-    mailer_host: localhost
-    mailer_user: null
-    mailer_password: null
-    locale: en
-    secret: ElkarToken
-    database_path: null
-    upload_dir: /var/spool/elkarbackup/uploads
-    public_key: /var/lib/elkarbackup/.ssh/id_rsa.pub
-    max_log_age: P1Y
-    tmp_dir: /tmp
-    rsnapshot: /usr/bin/rsnapshot
-    warning_load_level: 0.8
-    pagination_lines_per_page: 20
-    url_prefix: null
-    disable_background: true
-    mailer_from: null
-    home: /var/lib/elkarbackup
-    max_parallel_jobs: 1
-    post_on_pre_fail: true
--- a/CT-Files/elkarbackupDEB/Scripts/FirstRun.sh
+++ b/CT-Files/elkarbackupDEB/Scripts/FirstRun.sh
@@ -1,16 +0,0 @@
-#!/bin/ash
-ThisScriptConfigured=no
-##DB
-MysqlIP=127.0.0.1
-MysqlUsername=elkarbackup
-MysqlDatabase=elkarbackup
-MysqlPassword=Password
-
-#Check if script is configured
-if [ $ThisScriptConfigured = no ]; then
-    echo  "Script is not configured"
-    exit
-fi
-
-sed -i -e 's/DBServer/'$MysqlIP'/' -e 's/DBName/'$MysqlDatabase'/' -e 's/DBUser/'$MysqlUsername'/' -e 's/DBPass/'$MysqlPassword'/' -e 's/ElkarToken/'$(tr -dc 'A-Za-z0-9!#%*+,-.:;<=>?@^_' 2>/dev/null </dev/urandom | head -c 20 ; echo )'/' /etc/elkarbackup/parameters.yaml
-dpkg --configure -a
--- a/CT-Files/elkarbackupDEB/Scripts/Init.sh
+++ b/CT-Files/elkarbackupDEB/Scripts/Init.sh
@@ -1,11 +0,0 @@
-#!/bin/bash
-#Get Resources
-curl -L --retry 7 --retry-delay 5 http://ftp.debian.org/debian/pool/main/r/rsnapshot/rsnapshot_1.4.2-1_all.deb -o /opt/Setup/rsnapshot.deb || exit 1
-#Install elkarbackup
-apt install /opt/Setup/rsnapshot.deb elkarbackup -y
-echo "Apt intall being unable to configure elkarbackup is expected"
-rm /opt/Setup/rsnapshot.deb
-mv /opt/Setup/Configs/elkarbackupconf.yaml /etc/elkarbackup/parameters.yaml
-apt clean all
-#Configure apache
- rm /etc/apache2/sites-enabled/000-default.conf 
--- a/Readme.md
+++ b/Readme.md
@@ -18,7 +18,6 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin
 |------|:------:|:-----------:|
 | minimal | All | Minimal installed packages |
 | default | All | ssh-server and nano packages |
-| elkarbackup(ALP/DEB) | ALL | ElkarBackup rsyncsnapshot server |
 | jenkins | Debian | Jenkins server | 
 | jenkinsBuilder  | Debian | Basic node for Jenkins |
 | imgbuilder | Debian | LXC template builder node for Jenkins |
@@ -36,6 +35,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin
 | duplicati | Debian | Duplicati backup software |
 | fileshelter | Debian | FileShelter file shareing software |
 | esphome | Debian | ESPHome software to manage wifi-MCUs|
+| elkarbackupALP | Alpine | ElkarBackup rsyncsnapshot server |
 | gitea | Alpine | Gitea server |
 | nginx | Alpine | Nginx server for reverse-proxy use |
 | ddns | Alpine | DDNS client configured for OVH/OVH-Cloud |
@@ -255,8 +255,8 @@ lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=fi
 ## freshrss
 * Available on http://`<ip>`:80

-## elkarbackup
-**Alpine version recommended** 
+## elkarbackupALP
+**Debian version depricated and removed**
 1. Edit the parameters in the FistRun script in the container  `vi /opt/Setup/Scripts/FirstRun.sh`
 2. Run the FistRun script  in the container `ash /opt/Setup/Scripts/FirstRun.sh`
 3. Available on http://`<ip>` (Default username/password: root/root)