From 42680268a65ec33b207e264771a1c66595152b2e Mon Sep 17 00:00:00 2001 From: Jonathan Clarke Date: Sun, 15 Jun 2014 21:03:27 +0200 Subject: [PATCH] Fixes #5038: Extend roles to have 5 roles in total: split rudder-ldap into rudder-inventory-ldap and rudder-inventory-endpoint --- rudder-inventory-ldap/SOURCES/rudder-ldap | 0 rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec | 2 ++ rudder-inventory-ldap/debian/rules | 1 + rudder-reports/SOURCES/rudder-db | 0 rudder-reports/SPECS/rudder-reports.spec | 2 ++ rudder-reports/debian/rules | 1 + rudder-webapp/SOURCES/rudder-upgrade | 5 ++++- 7 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 rudder-inventory-ldap/SOURCES/rudder-ldap create mode 100644 rudder-reports/SOURCES/rudder-db diff --git a/rudder-inventory-ldap/SOURCES/rudder-ldap b/rudder-inventory-ldap/SOURCES/rudder-ldap new file mode 100644 index 000000000..e69de29bb diff --git a/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec b/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec index 1309c8001..654731f87 100644 --- a/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec +++ b/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec @@ -66,6 +66,7 @@ Source4: inventory.schema Source5: rudder.schema Source6: DB_CONFIG Source7: rudder-inventory-ldap +Source8: rudder-ldap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -146,6 +147,7 @@ install -m 644 %{SOURCE5} %{buildroot}/opt/rudder/etc/openldap/schema/ install -m 644 %{SOURCE6} %{buildroot}/var/rudder/ldap/openldap-data/ install -m 644 %{SOURCE7} %{buildroot}/opt/rudder/etc/server-roles.d/ +install -m 644 %{SOURCE8} %{buildroot}/opt/rudder/etc/server-roles.d/ # Syslog configuration mkdir -p %{buildroot}/etc/rsyslog.d diff --git a/rudder-inventory-ldap/debian/rules b/rudder-inventory-ldap/debian/rules index 732b96c32..568404181 100755 --- a/rudder-inventory-ldap/debian/rules +++ b/rudder-inventory-ldap/debian/rules @@ -74,6 +74,7 @@ binary-arch: install dh_install SOURCES/rudder.schema /opt/rudder/etc/openldap/schema/ dh_install SOURCES/DB_CONFIG /var/rudder/ldap/openldap-data/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-inventory-ldap /opt/rudder/etc/server-roles.d/ + dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-ldap /opt/rudder/etc/server-roles.d/ # dh_installmenu # dh_installdebconf # dh_installlogrotate diff --git a/rudder-reports/SOURCES/rudder-db b/rudder-reports/SOURCES/rudder-db new file mode 100644 index 000000000..e69de29bb diff --git a/rudder-reports/SPECS/rudder-reports.spec b/rudder-reports/SPECS/rudder-reports.spec index a7a3fa891..2836da43e 100644 --- a/rudder-reports/SPECS/rudder-reports.spec +++ b/rudder-reports/SPECS/rudder-reports.spec @@ -49,6 +49,7 @@ Group: Applications/System Source1: rudder-sources Source2: rudder.conf Source3: rudder-reports +Source4: rudder-db BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -101,6 +102,7 @@ cp %{SOURCE1}/rudder/rudder-core/src/main/resources/reportsSchema.sql %{buildroo cp -a %{SOURCE2} %{buildroot}/etc/rsyslog.d/rudder.conf install -m 644 %{SOURCE3} %{buildroot}/opt/rudder/etc/server-roles.d/ +install -m 644 %{SOURCE4} %{buildroot}/opt/rudder/etc/server-roles.d/ %pre -n rudder-reports #================================================= diff --git a/rudder-reports/debian/rules b/rudder-reports/debian/rules index 13482c878..f82252dc5 100755 --- a/rudder-reports/debian/rules +++ b/rudder-reports/debian/rules @@ -49,6 +49,7 @@ binary-arch: build install dh_install --sourcedir=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/ reportsSchema.sql /opt/rudder/etc/postgresql/ dh_install --sourcedir=$(CURDIR)/SOURCES/ rudder.conf /etc/rsyslog.d/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-reports /opt/rudder/etc/server-roles.d/ + dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-db /opt/rudder/etc/server-roles.d/ dh_link dh_strip dh_compress diff --git a/rudder-webapp/SOURCES/rudder-upgrade b/rudder-webapp/SOURCES/rudder-upgrade index 29f5b070d..101016b66 100755 --- a/rudder-webapp/SOURCES/rudder-upgrade +++ b/rudder-webapp/SOURCES/rudder-upgrade @@ -562,9 +562,12 @@ check_and_add_config_property rudder.server-roles.webapp " # - anything else (hostname, ip, or list of hostname or ip, seperated by commas): the # content that will be used inside the role file -# The hosts with the ldap role +# The hosts with the LDAP server role rudder.server-roles.ldap=autodetect +# The hosts with the inventory endpoint role +rudder.server-roles.inventory-endpoint=autodetect + # The hosts with the db role rudder.server-roles.db=autodetect