Skip to content

Commit

Permalink
Merge branch 'master' of github.com:quattor/configuration-modules-cor…
Browse files Browse the repository at this point in the history 
…e into nscd_config_merge
  • Loading branch information
Alan Fitton authored and Alan Fitton committed Nov 30, 2015
2 parents 10ff723 + f5bab69 commit 9903b5f
Show file tree
Hide file tree
Showing 79 changed files with 90 additions and 110 deletions.
2 changes: 1 addition & 1 deletion ncm-accounts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>accounts</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Component handling local accounts.</name>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion ncm-afsclt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>afsclt</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM AFS client configuration component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-aiiserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>aiiserver</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>aiiserver NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-altlogrotate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>altlogrotate</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>altlogrotate component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-amandaserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>amandaserver</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>amanda server NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-authconfig/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>authconfig</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>authconfig NCM component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-autofs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>autofs</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>autofs NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-ccm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>ccm</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>ccm NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-cdp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>cdp</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>cdp NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-ceph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>ceph</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Configuration module for CEPH</name>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion ncm-chkconfig/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>chkconfig</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM chkconfig component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-cron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>cron</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>CRON NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-cups/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>cups</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>CUPS configuration component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-directoryservices/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>directoryservices</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Directory Services NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-dirperm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>dirperm</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>dirperm NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-download/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.quattor.cfg.module</groupId>
<artifactId>download</artifactId>
<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Morgan Stanley ncm-download component</name>
<parent>
<groupId>org.quattor.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ncm-etcservices/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>etcservices</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>/etc/services configuration component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-filecopy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>filecopy</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>filecopy NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-filesystems/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>filesystems</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM component.for creating filesystems (and its associated block devices) on the fly.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-fmonagent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>fmonagent</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM fmonagent configuration component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-fstab/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>fstab</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM component.for manipulating the fstab and updating the mount points</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-ganglia/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>ganglia</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Ganglia components</name>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion ncm-gmetad/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>gmetad</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Component configuring the Ganglia gmetad</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-gmond/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>gmond</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Component configuring the Ganglia gmond</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-gpfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>gpfs</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM GPFS component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-grub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>grub</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM grub configuration component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-hostsaccess/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>hostsaccess</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM component for hosts.allow and host.deny</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-hostsfile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>hostsfile</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>/etc/hosts management for local hosts entries</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-icinga/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>icinga</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Icinga NCM component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-interactivelimits/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>interactivelimits</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>NCM interactive limits configuration component</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-ipmi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>ipmi</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Used to manage trivial IPMI configuration</name>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion ncm-iptables/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>iptables</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Setup the IPTABLES firewall.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-ldconf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>ldconf</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>ldconf NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-libvirtd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>libvirtd</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>libvirtd configuration</name>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion ncm-mcx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>mcx</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>MCX NCM component.</name>


Expand Down
2 changes: 1 addition & 1 deletion ncm-metaconfig/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>metaconfig</artifactId>

<packaging>pom</packaging>
<version>15.8.0-rc6-SNAPSHOT</version>
<version>15.8.1-SNAPSHOT</version>
<name>Configure services whose config format is standard, such as YAML or JSON.</name>


Expand Down
2 changes: 2 additions & 0 deletions ncm-metaconfig/src/main/metaconfig/ganesha/2.2/tests/profiles/attribute.pan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ prefix "/metaconfig/contents/main/test";
"RPC_Max_Connections" = 1024;
"Rquota_Port" = 0;
"Rquota_Program" = 100011;
"Short_File_Handle" = false;
"heartbeat_freq" = 1000;
"Active_krb5" = false;
"Credential_LifeTime" = 86400;
"Enable_Handle_Mapping" = false;
Expand Down
2 changes: 2 additions & 0 deletions ncm-metaconfig/src/main/metaconfig/ganesha/2.2/tests/regexps/attribute/all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ Tests for all attributes
^\s{4}Rquota_Program = 100011;$
^\s{4}SecType = none,sys;$
^\s{4}Sec_Type = "krb5";$
^\s{4}Short_File_Handle = FALSE;$
^\s{4}Squash = "root_squash";$
^\s{4}Srv_Addr = "127.0.0.1";$
^\s{4}Stripe_Unit = 8192;$
Expand All @@ -145,6 +146,7 @@ Tests for all attributes
^\s{4}fsal_trace = TRUE;$
^\s{4}glfs_log = "/tmp/gfapi.log";$
^\s{4}headers = "all";$
^\s{4}heartbeat_freq = 1000;$
^\s{4}link_support = TRUE;$
^\s{4}max_level = "FULL_DEBUG";$
^\s{4}maxread = 67108864;$
Expand Down
2 changes: 2 additions & 0 deletions ncm-metaconfig/src/main/metaconfig/ganesha/pan/schema_v2.pan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ type ganesha_v2_nfs_core_param = {
"RPC_Max_Connections" ? long(0..) = 1024
"Rquota_Port" ? long(0..) = 0
"Rquota_Program" ? long(1..) = 100011
"Short_File_Handle" ? boolean = false
"heartbeat_freq" ? long(0..5000) = 1000
};

@{ Ganesha Proxy remote_server subsection @}
Expand Down
17 changes: 0 additions & 17 deletions ncm-metaconfig/src/main/pan/components/metaconfig/config-common.pan
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ncm-metaconfig/src/main/pan/components/metaconfig/config-rpm.pan
View file

This file was deleted.

Loading

0 comments on commit 9903b5f

Please sign in to comment.