Merge pull request #39 from GutierrezJeremy/v2.2.0

Replace legacy facts with modern facts

README.md

@@ -121,7 +121,7 @@ You're encouraged to define your configuration using Hiera, especially if you pl
         UseReverseDNS: 'off'
         DefaultRoot: '~ !'
         DefaultChdir: '/var/ftp'
-        ServerName: '%{::fqdn}'
+        ServerName: '%{facts.networking.fqdn}'
         Port: '21'
         PassivePorts: '49152 65534'
         TransferLog: 'NONE'
@@ -142,8 +142,8 @@ You're encouraged to define your configuration using Hiera, especially if you pl
         TLSOptions: 'NoCertRequest'
         TLSCipherSuite: 'ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP'
         TLSVerifyClient: 'off'
-        TLSRSACertificateFile: '/etc/ssl/%{::fqdn}.crt'
-        TLSRSACertificateKeyFile: '/etc/ssl/%{::fqdn}.key'
+        TLSRSACertificateFile: '/etc/ssl/%{facts.networking.fqdn}.crt'
+        TLSRSACertificateKeyFile: '/etc/ssl/%{facts.networking.fqdn}.key'
         TLSLog: '/var/log/proftpd/tls.log'
       Global:
         RequireValidShell: 'off'

data/common.yaml

@@ -33,9 +33,9 @@ proftpd::service_name: 'proftpd'
 # Minimal default config, should work on most systems
 proftpd::default_options:
   'ROOT':
-    'ServerName': "ProFTPD server %{::fqdn}"
+    'ServerName': "ProFTPD server %{facts.networking.fqdn}"
     'ServerIdent': 'on "FTP Server ready."'
-    'ServerAdmin': "root@%{::domain}"
+    'ServerAdmin': "root@%{fact.networking.domain}"
     'DefaultServer': 'on'
     'DefaultRoot': '~ !adm'
     'AuthPAMConfig': 'proftpd'