defaults.yml in rest-ftp-daemon-0.300.3 vs defaults.yml in rest-ftp-daemon-0.302.0

@@ -1,61 +1,85 @@
-daemonize: true
-port: 3000
-nick: rftpd
-user: rftpd
-# group: rftpd
-# host: "myhost"
+defaults: &defaults
+  daemonize: true
+  port: 3000
+  user: rftpd
+  # group: rftpd
+  # host: "myhost"
+  allow_reload: false
 
-pools:
-  default: 2
+  pools:
+    default: 2
+    urgent: 1
 
-transfer:
-  # notify_after_sec: 5       # wait at least X seconds between HTTP notifications
-  # mkdir: true               # build directory tree if missing
-  # tempfile: true            # transfer to temporary file, rename after sucessful transfer
-  # overwrite: false          # overwrite any target file with the same name
-  timeout: 1800             # jobs running for longer than X seconds will be killed
+  reporter:
+    debug: false
+    timer: 10
+    debug: false
 
-retry:
-  # on_errors:
-  #   - ftp_perm_error
-  #   - net_temp_error
-  #   - conn_reset_by_peer
-  #   - conn_timed_out
-  #   - conn_refused
-  #   - sftp_auth_failed
-  #   - conn_host_is_down
-  #   - conn_unreachable
-  #   - conn_failed
-  #   - conn_openssl_error
-  # max_runs: 5
-  # max_age: 1800
-  # delay: 10
+  conchita:
+    debug: false
+    timer: 60
+    garbage_collector: true
+    clean_failed: 3600
+    clean_finished: 3600
+    clean_queued: 86400
 
-conchita:
-  # timer: 60
-  # garbage_collector: true
-  # clean_failed: 3600
-  # clean_finished: 3600
-  # clean_queued: 86400
+  transfer:
+    debug: false
+    mkdir: true               # build directory tree if missing
+    tempfile: true            # transfer to temporary file, rename after sucessful transfer
+    overwrite: false          # overwrite any target file with the same name
+    timeout: 1800             # jobs running for longer than X seconds will be killed
+    notify_after: 5           # wait at least X seconds between HTTP notifications
 
-newrelic:
-  # licence: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-  prefix: "rftpd"                         # app prefix
-  # platform: "bigbusiness"               # app platform name
-  # app_name: "rftpd-bigbusiness-dev"     # nickname used for naming app
+    debug_ftp: false
+    debug_sftp: false
 
-debug:
-  ftp: false
-  sftp: false
-  conchita: false
-  reporter: fakse
-  allow_reload: false
+    retry_on:
+      - ftp_perm_error
+      - net_temp_error
+      - conn_reset_by_peer
+      - conn_timed_out
+      - conn_refused
+      - sftp_auth_failed
+      - conn_host_is_down
+      - conn_unreachable
+      - conn_failed
+      - conn_openssl_error
+    retry_max: 5
+    retry_for: 1800
+    retry_after: 10
 
-logs:
-  thin:     "/var/log/rftpd-environment-thin.log"
-  queue:    "/var/log/rftpd-environment-core.log"
-  api:      "/var/log/rftpd-environment-core.log"
-  workers:  "/var/log/rftpd-environment-work.log"
-  jobs:     "/var/log/rftpd-environment-work.log"
-  notify:   "/var/log/rftpd-environment-work.log"
-  newrelic: "/var/log/rftpd-environment-newrelic.log"
+  newrelic:
+    # licence: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    prefix: "rftpd"                         # app prefix
+    # platform: "bigbusiness"               # app platform name
+    # app_name: "rftpd-bigbusiness-dev"     # nickname used for naming app
+
+  logs:
+    path:     "/var/log/"
+
+    thin:     "rftpd-environment-thin.log"
+    newrelic: "rftpd-environment-newrelic.log"
+    queue:    "rftpd-environment-core.log"
+    api:      "rftpd-environment-core.log"
+    workers:  "rftpd-environment-core.log"
+
+    transfer: "rftpd-environment-workers.log"
+    conchita: "rftpd-environment-workers.log"
+    reporter: "rftpd-environment-workers.log"
+    notify:   "rftpd-environment-workers.log"
+
+test:
+  <<: *defaults
+
+development:
+  <<: *defaults
+  port: 3100
+
+pre-production:
+  <<: *defaults
+  port: 3200
+
+production:
+  <<: *defaults
+  port: 3300