Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Int 5038/extend roles to have 5 roles in total split rudder ldap into rudder inventory ldap and rudder inventory endpoint #373

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
2 changes: 2 additions & 0 deletions rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions rudder-inventory-ldap/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file.
2 changes: 2 additions & 0 deletions rudder-reports/SPECS/rudder-reports.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
#=================================================
Expand Down
1 change: 1 addition & 0 deletions rudder-reports/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion rudder-webapp/SOURCES/rudder-upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down