Removes unneeded config

diff --git a/files/airsonic.conf b/files/airsonic.conf
deleted file mode 100644 (file)
index 5836f2f..0000000
--- a/files/airsonic.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Set the location of the standalone war to use
-JAVA_JAR=/var/lib/airsonic/airsonic.war
-
-# Set any java opts separated by spaces
-#JAVA_OPTS=-Xmx700m
-
-# Set a different location for airsonic home. 
-# If this path is /var/libresonic or even contains "libresonic",
-# the data from a previous libresonic can be used as is (i.e. without
-# renaming libresonic.properties,db/libresonic*,etc
-AIRSONIC_HOME=/var/lib/airsonic
-
-# Change the port to listen on
-PORT=8200
-
-# Change the path that is listened on
-#CONTEXT_PATH=/airsonic
-
-# Add any java args. These are different than JAVA_OPTS in that 
-# they are passed directly to the program. The default is empty:
-#JAVA_ARGS=
-
-# Note that there are several settings for spring boot, not explicitly listed
-# here, but can be used in either JAVA_OPTS or JAVA_ARGS. The full list
-# can be found here: 
-# https://docs.spring.io/spring-boot/docs/1.4.5.RELEASE/reference/htmlsingle/#common-application-properties
-# For example to set debug across the board:
-#JAVA_ARGS=--debug
-
-# Or to change the ip address that is listened on:
-#JAVA_ARGS=--server.address=127.0.0.1

diff --git a/manifests/init.pp b/manifests/init.pp
index dfd361b388a481afa1e7760602e580a85ac8295d..40c77148596c7472edc63e80a58ecd5eb3d9fa6a 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,18 +46,6 @@ class airsonic {
     require  => File['/var/lib/airsonic', '/usr/local/sbin/airsonic-download'],
   }
 
-  file { '/etc/default/airsonic':
-    ensure  => present,
-    owner   => 'airsonic',
-    group   => 'airsonic',
-    mode    => '0644',
-    source  => [ 
-      'puppet:///modules/site_airsonic/airsonic.conf',
-      'puppet:///modules/airsonic/airsonic.conf',
-    ],
-    notify  => Service['airsonic'],
-  }
-
   file { '/etc/systemd/system/airsonic.service':
     ensure => present,
     owner  => root,
@@ -78,7 +66,7 @@ class airsonic {
     ensure  => running,
     enable  => true,
     require => [
-      File['/var/lib/airsonic', '/etc/default/airsonic', '/etc/systemd/system/airsonic.service', ],
+      File['/var/lib/airsonic', '/etc/systemd/system/airsonic.service', ],
       Exec['airsonic-download', 'systemctl-enable-airsonic'],
       Package['default-jre'],
     ],