From eb57a4ad9e982eea6a5dc0c7543c61a437265568 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 19 Sep 2019 19:51:27 +0200
Subject: [PATCH] Get rid of etckeeper

---
 data/hooks/conf_regen/01-yunohost      |  3 --
 data/templates/yunohost/etckeeper.conf | 43 --------------------------
 debian/control                         |  2 +-
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 data/templates/yunohost/etckeeper.conf

diff --git a/data/hooks/conf_regen/01-yunohost b/data/hooks/conf_regen/01-yunohost
index faf041110..f22de7a53 100755
--- a/data/hooks/conf_regen/01-yunohost
+++ b/data/hooks/conf_regen/01-yunohost
@@ -53,9 +53,6 @@ do_pre_regen() {
   else
       sudo cp services.yml /etc/yunohost/services.yml
   fi
-
-  mkdir -p "$pending_dir"/etc/etckeeper/
-  cp etckeeper.conf "$pending_dir"/etc/etckeeper/
 }
 
 _update_services() {
diff --git a/data/templates/yunohost/etckeeper.conf b/data/templates/yunohost/etckeeper.conf
deleted file mode 100644
index 2d11c3dc6..000000000
--- a/data/templates/yunohost/etckeeper.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# The VCS to use.
-#VCS="hg"
-VCS="git"
-#VCS="bzr"
-#VCS="darcs"
-
-# Options passed to git commit when run by etckeeper.
-GIT_COMMIT_OPTIONS="--quiet"
-
-# Options passed to hg commit when run by etckeeper.
-HG_COMMIT_OPTIONS=""
-
-# Options passed to bzr commit when run by etckeeper.
-BZR_COMMIT_OPTIONS=""
-
-# Options passed to darcs record when run by etckeeper.
-DARCS_COMMIT_OPTIONS="-a"
-
-# Uncomment to avoid etckeeper committing existing changes
-# to /etc automatically once per day.
-#AVOID_DAILY_AUTOCOMMITS=1
-
-# Uncomment the following to avoid special file warning
-# (the option is enabled automatically by cronjob regardless).
-#AVOID_SPECIAL_FILE_WARNING=1
-
-# Uncomment to avoid etckeeper committing existing changes to 
-# /etc before installation. It will cancel the installation,
-# so you can commit the changes by hand.
-#AVOID_COMMIT_BEFORE_INSTALL=1
-
-# The high-level package manager that's being used.
-# (apt, pacman-g2, yum, zypper etc)
-HIGHLEVEL_PACKAGE_MANAGER=apt
-
-# The low-level package manager that's being used.
-# (dpkg, rpm, pacman, pacman-g2, etc)
-LOWLEVEL_PACKAGE_MANAGER=dpkg
-
-# To push each commit to a remote, put the name of the remote here.
-# (eg, "origin" for git). Space-separated lists of multiple remotes
-# also work (eg, "origin gitlab github" for git).
-PUSH_REMOTE=""
diff --git a/debian/control b/debian/control
index 64c7cd31d..c0604d90e 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends: ${python:Depends}, ${misc:Depends}
  , equivs, lsof
 Recommends: yunohost-admin
  , openssh-server, ntp, inetutils-ping | iputils-ping
- , bash-completion, rsyslog, etckeeper
+ , bash-completion, rsyslog
  , php-gd, php-curl, php-gettext, php-mcrypt
  , python-pip
  , unattended-upgrades