/
0001-rudder-agent-to-rudder-agent-thin-debian.patch
141 lines (128 loc) · 5.16 KB
/
0001-rudder-agent-to-rudder-agent-thin-debian.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
diff --git a/changelog b/changelog
index def9006..3758608 100644
--- a/changelog
+++ b/changelog
@@ -1,23 +1,6 @@
-rudder-agent (2.3.0~alpha~git-0) lenny; urgency=low
+rudder-agent-thin (2.11.0~git-0) wheezy; urgency=low
- * Bump package number to follow git development
+ * Initial package, using rudder-agent as a base
+ * Removed fusion-inventory code
- -- Jonathan CLARKE <jonathan.clarke@normation.com> Mon, 07 Mar 2011 11:47:27 +0000
-
-rudder-agent (2.2.0~beta1-0) lenny; urgency=low
-
- * Release 2.2.beta1
-
- -- Jonathan Clarke <jonathan.clarke@normation.com> Tue, 01 Mar 2011 17:28:31 +0100
-
-rudder-agent (3.1.4-0) lenny; urgency=low
-
- * CFEngine version number correction
-
- -- Nicolas Perron <nicolas.perron@normation.com> Fri, 25 Feb 2011 20:00:18 +0100
-
-rudder-agent (3.1.2-0) lenny; urgency=low
-
- * New upstream version
-
- -- Nicolas Perron <nicolas.perrone@normation.com> Wed, 23 Feb 2011 18:16:27 +0100
+ -- Matthieu CERDA <matthieu.cerda@normation.com> Fri, 30 May 2014 16:55:27 +0200
diff --git a/control b/control
index 15880ec..cbf4500 100644
--- a/control
+++ b/control
@@ -1,4 +1,4 @@
-Source: rudder-agent
+Source: rudder-agent-thin
Section: admin
Priority: extra
Maintainer: Rudder packaging team <rudder-packaging@rudder-project.org>
@@ -6,19 +6,13 @@ Build-Depends: debhelper (>= 7), libssl-dev, bison, gcc, flex, autoconf, automak
Standards-Version: 3.8.0
Homepage: http://www.rudder-project.org
-Package: rudder-agent
+Package: rudder-agent-thin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, uuid-runtime, dmidecode, cron, net-tools, openssl
-# The dependencies below are defined in order to use rudder-agent
-# for the server. This will add capabilities to send inventories
-# from the server itself.
-Provides: rudder-cfengine-community, rudder-agent
-Conflicts: rudder-cfengine-community, rudder-agent-thin
-Replaces: rudder-cfengine-community, rudder-server-root (<< 2.4.0~beta2)
-Breaks: rudder-server-root (<< 2.4.0~beta2)
-Description: Configuration management and audit tool - agent
+Depends: ${shlibs:Depends}, ${misc:Depends}, uuid-runtime, dmidecode, cron, net-tools, openssl, fusioninventory-agent
+Provides: rudder-agent
+Conflicts: rudder-agent
+Description: Configuration management and audit tool
Rudder is an open source configuration management and audit solution.
.
This package contains the agent that must be installed on all nodes to be
- managed by Rudder. It is based on two main components: CFEngine Community 3 and
- FusionInventory.
+ managed by Rudder. It is based on CFEngine Community.
diff --git a/copyright b/copyright
index 7930a66..99c1536 100644
--- a/copyright
+++ b/copyright
@@ -1,24 +1,20 @@
This package was debianized by:
- Jonathan Clarke <Jonathan Clarke <jonathan.clarke@normation.com>> on Thu, 16 Dec 2010 12:13:26 +0100
+ Matthieu CERDA <matthieu.cerda@normation.com>> on Fri, 30 Apr 2014 16:55:26 +0200
-It was downloaded from:
+It uses code from:
- http://www.cfengine.com/ and http://www.fusioninventory.org/
+ http://www.cfengine.com/
Upstream Author(s):
Mark Burgess <mark@cfengine.com>
CFEngine AS <http://www.cfengine.com>
- Copyright 2006-2010 OCS Inventory contributors
- Copyright 2010-2011 FusionInventory Team
Copyright:
+ Copyright (C) 2014- Normation SAS
Copyright (C) 2008- CFEngine AS.
- Copyright 2006-2010 OCS Inventory contributors
- Copyright 2010-2011 FusionInventory Team
- Copyright (C) 2010 Normation SAS
License:
@@ -26,8 +22,3 @@ License:
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is:
-
- Copyright (C) 2010 Normation SAS
-
diff --git a/rules b/rules
index 071a2b6..cba53f8 100755
--- a/rules
+++ b/rules
@@ -15,8 +15,6 @@ configure-stamp:
dh_testdir
# dh_prep has been moved from 'install' target since we need to build LMDB first
dh_prep
- # Add here commands to configure the package.
- cd SOURCES && ./perl-prepare.sh $(CURDIR)/SOURCES/fusioninventory-agent
# Compile the LMDB library and install it in /opt/rudder
# LMDB source code does not know how to create destination folders, do it ourselves
for i in bin lib include man/man1; do mkdir -p $(CURDIR)/debian/tmp/opt/rudder/$$i; done
@@ -88,6 +86,5 @@ binary-arch: install
# Install the profile.d file (PATH adjustment)
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-agent.sh /etc/profile.d
- dh_install --SOURCEDIR=$(CURDIR)/SOURCES/perl-custom/opt rudder /opt
dh_install --SOURCEDIR=$(CURDIR)/SOURCES run-inventory /opt/rudder/bin
dh_install --SOURCEDIR=$(CURDIR)/SOURCES initial-promises /opt/rudder/share
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-agent-utilities/bin rudder /opt/rudder/bin
@@ -101,9 +98,7 @@ binary-arch: install
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ check-rudder-agent /opt/rudder/bin/
# Install script to get local processes on VZ systems
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ vzps.py /opt/rudder/bin/
- # Install a script to run things in rudder's Perl environment
- dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-perl /opt/rudder/bin/
- dh_installcron
+ dh_installcron --name=rudder-agent
# dh_installinfo
dh_installman
dh_link