From d1e5392a9a72d04391ca456890aee44da9c25bdc Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 25 May 2018 13:32:18 +0200 Subject: [PATCH 1/7] paquet debian --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 20cfc58..feacf18 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ ################################ -# Makefile pour XXX-XXX +# Makefile pour eole-prometheus ################################ SOURCE=eole-prometheus -VERSION=0.1 +VERSION=0.0.1 EOLE_VERSION=2.6 EOLE_RELEASE=2.6.2 PKGAPPS=non From 0a656de9e6cae968e41d134f7d88fbb6e4938ff0 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 25 May 2018 15:56:49 +0200 Subject: [PATCH 2/7] oubli du dossier debian ... --- debian/compat | 1 + debian/control | 11 +++++++++ debian/copyright | 44 ++++++++++++++++++++++++++++++++++ debian/eole-prometheus.install | 0 debian/rules | 8 +++++++ debian/source/format | 1 + 6 files changed, 65 insertions(+) create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/eole-prometheus.install create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c5656ec --- /dev/null +++ b/debian/control @@ -0,0 +1,11 @@ +Source: eole-prometheus +Section: web +Priority: optional +Maintainer: Cadoles +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 + +Package: eole-prometheus +Architecture: amd64 +Depends: ${misc:Depends} +Description: Eolisation de Prometheus diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..60940b1 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,44 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: {PROJECT} +Source: {URL} + +Files: * +Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}> +License: {UPSTREAM LICENSE} + +Files: debian/* +Copyright: 2012 Équipe EOLE +License: CeCILL-2 + +License: {UPSTREAM LICENSE} + {TEXT OF THE LICENSE} + +License: CeCILL-2 + This software is governed by the CeCILL-2 license under French law and + abiding by the rules of distribution of free software. You can use, + modify and or redistribute the software under the terms of the CeCILL-2 + license as circulated by CEA, CNRS and INRIA at the following URL + "http://www.cecill.info";. + . + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited + liability. + . + In this respect, the user's attention is drawn to the risks associated + with loading, using, modifying and/or developing or reproducing the + software by the user in light of its specific status of free software, + that may mean that it is complicated to manipulate, and that also + therefore means that it is reserved for developers and experienced + professionals having in-depth computer knowledge. Users are therefore + encouraged to load and test the software's suitability as regards their + requirements in conditions enabling the security of their systems and/or + data to be ensured and, more generally, to use and operate it in the + same conditions as regards security. + . + The fact that you are presently reading this means that you have had + knowledge of the CeCILL-2 license and that you accept its terms. + . + On Eole systems, the complete text of the CeCILL-2 License can be found + in '/usr/share/common-licenses/CeCILL-2-en'. \ No newline at end of file diff --git a/debian/eole-prometheus.install b/debian/eole-prometheus.install new file mode 100644 index 0000000..e69de29 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ea37544 --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..46ebe02 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) \ No newline at end of file From 2da03082ec7f0ac0b1ad77eac1f02a38ccb5b49d Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Fri, 1 Jun 2018 11:30:56 +0200 Subject: [PATCH 3/7] Adding debian packaging files --- debian/compat | 1 + debian/control | 16 ++++++++++++++ debian/copyright | 44 ++++++++++++++++++++++++++++++++++++++ debian/gbp.conf | 3 +++ debian/rules | 9 ++++++++ debian/source/.format.un~ | Bin 0 -> 545 bytes debian/source/format | 1 + 7 files changed, 74 insertions(+) create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100755 debian/rules create mode 100644 debian/source/.format.un~ create mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d7900ee --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: eole-prometheus +Section: web +Priority: optional +Maintainer: Cadoles +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 +Homepage: https://forge.cadoles.com/Cadoles/eole-prometheus +Vcs-Git: https://forge.cadoles.com/Cadoles/eole-prometheus.git +Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-prometheus + +Package: eole-prometheus +Architecture: all +Depends: ${misc:Depends}, prometheus-server +Description: Dictionnaires et templates pour la configuration d'un serveur prometheus, testée uniquement avec eolebase + . + Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..655a069 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,44 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: {PROJECT} +Source: {URL} + +Files: * +Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}> +License: {UPSTREAM LICENSE} + +Files: debian/* +Copyright: 2012 Équipe EOLE +License: CeCILL-2 + +License: {UPSTREAM LICENSE} + {TEXT OF THE LICENSE} + +License: CeCILL-2 + This software is governed by the CeCILL-2 license under French law and + abiding by the rules of distribution of free software. You can use, + modify and or redistribute the software under the terms of the CeCILL-2 + license as circulated by CEA, CNRS and INRIA at the following URL + "http://www.cecill.info";. + . + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited + liability. + . + In this respect, the user's attention is drawn to the risks associated + with loading, using, modifying and/or developing or reproducing the + software by the user in light of its specific status of free software, + that may mean that it is complicated to manipulate, and that also + therefore means that it is reserved for developers and experienced + professionals having in-depth computer knowledge. Users are therefore + encouraged to load and test the software's suitability as regards their + requirements in conditions enabling the security of their systems and/or + data to be ensured and, more generally, to use and operate it in the + same conditions as regards security. + . + The fact that you are presently reading this means that you have had + knowledge of the CeCILL-2 license and that you accept its terms. + . + On Eole systems, the complete text of the CeCILL-2 License can be found + in '/usr/share/common-licenses/CeCILL-2-en'. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..18f2d64 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +# Set per distribution debian tag +[DEFAULT] +debian-tag = debian/eole/%(version)s diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..0c06312 --- /dev/null +++ b/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ + diff --git a/debian/source/.format.un~ b/debian/source/.format.un~ new file mode 100644 index 0000000000000000000000000000000000000000..8ec6bc106b90dca22855a3de0a8099342d4cae4c GIT binary patch literal 545 zcmWH`%$*;a=aT=FfhppbTiWbA)sU;EM$fc0CU* Date: Fri, 1 Jun 2018 11:32:00 +0200 Subject: [PATCH 4/7] Revert "Adding debian packaging files" This reverts commit 2da03082ec7f0ac0b1ad77eac1f02a38ccb5b49d. --- debian/compat | 1 - debian/control | 16 -------------- debian/copyright | 44 -------------------------------------- debian/gbp.conf | 3 --- debian/rules | 9 -------- debian/source/.format.un~ | Bin 545 -> 0 bytes debian/source/format | 1 - 7 files changed, 74 deletions(-) delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/gbp.conf delete mode 100755 debian/rules delete mode 100644 debian/source/.format.un~ delete mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index d7900ee..0000000 --- a/debian/control +++ /dev/null @@ -1,16 +0,0 @@ -Source: eole-prometheus -Section: web -Priority: optional -Maintainer: Cadoles -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.3 -Homepage: https://forge.cadoles.com/Cadoles/eole-prometheus -Vcs-Git: https://forge.cadoles.com/Cadoles/eole-prometheus.git -Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-prometheus - -Package: eole-prometheus -Architecture: all -Depends: ${misc:Depends}, prometheus-server -Description: Dictionnaires et templates pour la configuration d'un serveur prometheus, testée uniquement avec eolebase - . - Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 655a069..0000000 --- a/debian/copyright +++ /dev/null @@ -1,44 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: {PROJECT} -Source: {URL} - -Files: * -Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}> -License: {UPSTREAM LICENSE} - -Files: debian/* -Copyright: 2012 Équipe EOLE -License: CeCILL-2 - -License: {UPSTREAM LICENSE} - {TEXT OF THE LICENSE} - -License: CeCILL-2 - This software is governed by the CeCILL-2 license under French law and - abiding by the rules of distribution of free software. You can use, - modify and or redistribute the software under the terms of the CeCILL-2 - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info";. - . - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited - liability. - . - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - . - The fact that you are presently reading this means that you have had - knowledge of the CeCILL-2 license and that you accept its terms. - . - On Eole systems, the complete text of the CeCILL-2 License can be found - in '/usr/share/common-licenses/CeCILL-2-en'. diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 18f2d64..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Set per distribution debian tag -[DEFAULT] -debian-tag = debian/eole/%(version)s diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 0c06312..0000000 --- a/debian/rules +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -%: - dh $@ - diff --git a/debian/source/.format.un~ b/debian/source/.format.un~ deleted file mode 100644 index 8ec6bc106b90dca22855a3de0a8099342d4cae4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmWH`%$*;a=aT=FfhppbTiWbA)sU;EM$fc0CU* Date: Fri, 1 Jun 2018 11:41:59 +0200 Subject: [PATCH 5/7] Adding debian depends --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c5656ec..d9dd81f 100644 --- a/debian/control +++ b/debian/control @@ -7,5 +7,5 @@ Standards-Version: 3.9.3 Package: eole-prometheus Architecture: amd64 -Depends: ${misc:Depends} +Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter Description: Eolisation de Prometheus From c0b430ec2cd4eea95a3d8f7ea80f7085847d1e92 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 6 Jun 2018 14:42:11 +0200 Subject: [PATCH 6/7] Adding missing depend --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d9dd81f..eef0a3f 100644 --- a/debian/control +++ b/debian/control @@ -7,5 +7,5 @@ Standards-Version: 3.9.3 Package: eole-prometheus Architecture: amd64 -Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter +Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter, prometheus-alertmanager Description: Eolisation de Prometheus From 1f6a18a14baf59e11fe13e28ec67a3ce8d0b22fc Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 6 Jun 2018 14:45:27 +0200 Subject: [PATCH 7/7] We need curl --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index eef0a3f..20fc1c5 100644 --- a/debian/control +++ b/debian/control @@ -7,5 +7,5 @@ Standards-Version: 3.9.3 Package: eole-prometheus Architecture: amd64 -Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter, prometheus-alertmanager +Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter, prometheus-alertmanager, curl Description: Eolisation de Prometheus