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

ncm-hostsfile: merge config-{common,rpm} into config.pan #611

Merged
merged 1 commit into from
Dec 2, 2015
Merged

ncm-hostsfile: merge config-{common,rpm} into config.pan #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions ncm-hostsfile/src/main/pan/components/hostsfile/config-common.pan
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ncm-hostsfile/src/main/pan/components/hostsfile/config-rpm.pan
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions ncm-hostsfile/src/main/pan/components/hostsfile/config.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,14 @@

unique template components/${project.artifactId}/config;

include { 'components/${project.artifactId}/config-common' };
include { 'components/${project.artifactId}/config-rpm' };
include 'components/${project.artifactId}/schema';

# Package to install
"/software/packages" = pkg_repl("ncm-${project.artifactId}", "${no-snapshot-version}-${rpm.release}", "noarch");

# Set prefix to root of component configuration.
prefix '/software/components/${project.artifactId}';

'version' = '${no-snapshot-version}';
'active' ?= false;
'dispatch' ?= false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Previously this was true (and for active). version has been dropped too: this is what causes ncm-cdispd to re-run the component when the rpm is updated.