From c836c2a80e2fd64e4f18cdbba39a7eda1f241e89 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 18 Mar 2017 20:36:43 +0000 Subject: [PATCH] rename nfs-server to nfs_server --- manifests/site.pp | 2 +- .../{nfs-server => nfs_server}/files/lockd.local.modprobe | 0 .../{nfs-server => nfs_server}/files/nfs-common.default | 0 .../files/nfs-kernel-server.default | 0 modules/{nfs-server => nfs_server}/manifests/init.pp | 8 ++++---- 5 files changed, 5 insertions(+), 5 deletions(-) rename modules/{nfs-server => nfs_server}/files/lockd.local.modprobe (100%) rename modules/{nfs-server => nfs_server}/files/nfs-common.default (100%) rename modules/{nfs-server => nfs_server}/files/nfs-kernel-server.default (100%) rename modules/{nfs-server => nfs_server}/manifests/init.pp (89%) diff --git a/manifests/site.pp b/manifests/site.pp index 8e72e7d33..97e962abe 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -100,7 +100,7 @@ node default { } if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] { - include nfs-server + include nfs_server } if $::brokenhosts { diff --git a/modules/nfs-server/files/lockd.local.modprobe b/modules/nfs_server/files/lockd.local.modprobe similarity index 100% rename from modules/nfs-server/files/lockd.local.modprobe rename to modules/nfs_server/files/lockd.local.modprobe diff --git a/modules/nfs-server/files/nfs-common.default b/modules/nfs_server/files/nfs-common.default similarity index 100% rename from modules/nfs-server/files/nfs-common.default rename to modules/nfs_server/files/nfs-common.default diff --git a/modules/nfs-server/files/nfs-kernel-server.default b/modules/nfs_server/files/nfs-kernel-server.default similarity index 100% rename from modules/nfs-server/files/nfs-kernel-server.default rename to modules/nfs_server/files/nfs-kernel-server.default diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs_server/manifests/init.pp similarity index 89% rename from modules/nfs-server/manifests/init.pp rename to modules/nfs_server/manifests/init.pp index 7021ef330..5545114f6 100644 --- a/modules/nfs-server/manifests/init.pp +++ b/modules/nfs_server/manifests/init.pp @@ -1,4 +1,4 @@ -class nfs-server { +class nfs_server { package { [ 'nfs-common', @@ -58,17 +58,17 @@ class nfs-server { } file { '/etc/default/nfs-common': - source => 'puppet:///modules/nfs-server/nfs-common.default', + source => 'puppet:///modules/nfs_server/nfs-common.default', before => Package['nfs-common'], notify => Service['nfs-common'], } file { '/etc/default/nfs-kernel-server': - source => 'puppet:///modules/nfs-server/nfs-kernel-server.default', + source => 'puppet:///modules/nfs_server/nfs-kernel-server.default', before => Package['nfs-kernel-server'], notify => Service['nfs-kernel-server'], } file { '/etc/modprobe.d/lockd.local': - source => 'puppet:///modules/nfs-server/lockd.local.modprobe', + source => 'puppet:///modules/nfs_server/lockd.local.modprobe', before => Package['nfs-common'], notify => Service['nfs-common'], } -- 2.20.1