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.

Sign up for GitHub

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

Jump to bottom

Packaging: Unmark systemd service file as a config file #29004

Merged
merged 16 commits into from
May 2, 2018
Merged

Packaging: Unmark systemd service file as a config file #29004

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
509c0a2
Packaging: Unmark systemd service file as a config file
rjernst Mar 13, 2018
7a942dc
Merge branch 'master' into systemd_service_conf
rjernst Mar 13, 2018
dca50b9
Merge branch 'master' into systemd_service_conf
rjernst Mar 20, 2018
863fe12
Merge branch 'master' into systemd_service_conf
rjernst Mar 21, 2018
a4dc719
remove vagrant check on old file and add migration docs
rjernst Mar 21, 2018
367a90d
Merge branch 'master' into systemd_service_conf
rjernst Apr 17, 2018
258035d
Merge branch 'master' into systemd_service_conf
rjernst Apr 18, 2018
432b8d5
Merge branch 'master' into systemd_service_conf
rjernst Apr 19, 2018
886e051
Merge branch 'master' into systemd_service_conf
rjernst Apr 19, 2018
95f0e88
Merge branch 'master' into systemd_service_conf
rjernst Apr 19, 2018
a675a55
fix systemd exit code
rjernst Apr 19, 2018
3eeb463
Merge branch 'master' into systemd_service_conf
rjernst Apr 19, 2018
a5bba4b
add changelog entry
rjernst Apr 19, 2018
8ab9ca3
Merge branch 'master' into systemd_service_conf
rjernst Apr 25, 2018
7b677b5
add conditional for systemd missing exit code
rjernst Apr 26, 2018
d1fa804
Merge branch 'master' into systemd_service_conf
rjernst May 2, 2018
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
1 change: 0 additions & 1 deletion distribution/packages/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ Closure commonPackageConfig(String type) {
}

// ========= systemd =========
configurationFile '/usr/lib/systemd/system/elasticsearch.service'
into('/usr/lib/tmpfiles.d') {
from "${packagingFiles}/systemd/elasticsearch.conf"
}
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<<write-thread-pool-fallback, Removed `thread_pool.bulk.*` settings and
`es.thread_pool.write.use_bulk_as_display_name` system property>> ({pull}29609[#29609])

<<systemd-service-file-config, Systemd service file is no longer marked as configuration>> ({pull}29004[#29004])

=== Breaking Java Changes

=== Deprecations
Expand Down
2 changes: 2 additions & 0 deletions docs/reference/migration/migrate_7_0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Elasticsearch 6.x in order to be readable by Elasticsearch 7.x.
* <<breaking_70_indices_changes>>
* <<breaking_70_mappings_changes>>
* <<breaking_70_search_changes>>
* <<breaking_70_packaging_changes>>
* <<breaking_70_plugins_changes>>
* <<breaking_70_analysis_changes>>
* <<breaking_70_api_changes>>
Expand All @@ -41,6 +42,7 @@ include::migrate_7_0/cluster.asciidoc[]
include::migrate_7_0/indices.asciidoc[]
include::migrate_7_0/mappings.asciidoc[]
include::migrate_7_0/search.asciidoc[]
include::migrate_7_0/packaging.asciidoc[]
include::migrate_7_0/plugins.asciidoc[]
include::migrate_7_0/api.asciidoc[]
include::migrate_7_0/java.asciidoc[]
Expand Down
10 changes: 10 additions & 0 deletions docs/reference/migration/migrate_7_0/packaging.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[[breaking_70_packaging_changes]]
=== Packaging changes

[[systemd-service-file-config]]
==== systemd service file is no longer configuration
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you add an entry to the changelog too?


The systemd service file `/usr/lib/systemd/system/elasticsearch.service`
was previously marked as a configuration file in rpm and deb packages.
Overrides to the systemd elasticsearch service should be made
in `/etc/systemd/system/elasticsearch.service.d/override.conf`.
3 changes: 1 addition & 2 deletions qa/vagrant/src/test/resources/packaging/tests/30_deb_package.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ setup() {
if is_systemd; then
# Debian systemd distros usually returns exit code 3
run systemctl status elasticsearch.service
[ "$status" -eq 3 ]
[ "$status" -eq 4 ]

run systemctl is-enabled elasticsearch.service
[ "$status" -eq 1 ]
Expand Down Expand Up @@ -161,7 +161,6 @@ setup() {

# The service files are still here
assert_file_exist "/etc/init.d/elasticsearch"
assert_file_exist "/usr/lib/systemd/system/elasticsearch.service"
}

@test "[DEB] purge package" {
Expand Down