From 2ffb17a08f31188558be4dfb7234343da9f2e7f1 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 14 May 2023 17:57:29 +0200 Subject: [PATCH] debian: fix config by applying a patch, instead of using a debian specific copy. --- debian/config.yml | 56 -------------------- debian/install | 1 - debian/patches/0001-fix-config-logpath.patch | 12 +++++ debian/patches/series | 1 + debian/rules | 2 +- 5 files changed, 14 insertions(+), 58 deletions(-) delete mode 100644 debian/config.yml delete mode 100644 debian/install create mode 100644 debian/patches/0001-fix-config-logpath.patch create mode 100644 debian/patches/series diff --git a/debian/config.yml b/debian/config.yml deleted file mode 100644 index 2f9c62a..0000000 --- a/debian/config.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: thalos - -# Endpoint to nodeos api -api: "http://127.0.0.1:8080" - -# Logging settings -log: - # Filename to use. - filename: thalos.log - # Directory to store the logfiles in. - directory: /var/log/thalos - # Format to rename log files when rotating - time_format: 2006-01-02_150405 - - # Log rotation, logfile is rotated when any of these - # conditions are met. set to 0 or remove to disable. - - # Rotate when the file reaches this size. - max_filesize: 200mb - # Rotate when the file is this old. - max_time: 24h - -# SHIP settings -ship: - - # Url to ship api. - url: "ws://127.0.0.1:8089" - - # Fetch irreversible blocks only - # irreversible_only: true - - # Request ship to start sending blocks from this block. - # If not set, the head block reported by the nodeos api is used. - #start_block_num: 1000 - - # Request ship to stop sending blocks when reaching this block. - #end_block_num: 2000 - -# Telegram notifications -#telegram: -# id: "110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsaw" -# channel: -123456789 - -# Redis settings -redis: - # Address (and port) to redis server - addr: "localhost:6379" - - # Password to use when authenticating - pasword: "" - - # database index - db: 0 - - # Key prefix. - prefix: "ship" diff --git a/debian/install b/debian/install deleted file mode 100644 index 90e4ff6..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -debian/config.yml /etc/thalos \ No newline at end of file diff --git a/debian/patches/0001-fix-config-logpath.patch b/debian/patches/0001-fix-config-logpath.patch new file mode 100644 index 0000000..801fd2b --- /dev/null +++ b/debian/patches/0001-fix-config-logpath.patch @@ -0,0 +1,12 @@ +diff --git a/config.example.yml b/config.example.yml +index 9f4272a..8daac0a 100644 +--- a/config.example.yml ++++ b/config.example.yml +@@ -11,7 +11,7 @@ log: + # Filename to use. + filename: thalos.log + # Directory to store the logfiles in. +- directory: logs ++ directory: /var/log + # Format to rename log files when rotating + time_format: 2006-01-02_150405 \ No newline at end of file diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b3bfc30 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-fix-config-logpath.patch \ No newline at end of file diff --git a/debian/rules b/debian/rules index c4f8ad4..d407767 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/dpkg/default.mk %: - dh $@ -P debian/pkgroot + dh $@ --with quilt -P debian/pkgroot override_dh_auto_build: dh_auto_build -- GOOS=linux