salt: T2384: always log to syslog

3 files changed, 2 insertions, 51 deletions

diff --git a/data/templates/salt-minion/minion.tmpl b/data/templates/salt-minion/minion.tmpl
index 5e50d588c..0b97c0524 100644
--- a/data/templates/salt-minion/minion.tmpl
+++ b/data/templates/salt-minion/minion.tmpl
@@ -21,11 +21,7 @@ hash_type: {{ hash_type }}
 # location. Remote logging works best when configured to use rsyslogd(8) (e.g.:
 # ``file:///dev/log``), with rsyslogd(8) configured for network logging. The URI
 # format is: <file|udp|tcp>://<host|socketpath>:<port-if-required>/<log-facility>
-#log_file: /var/log/salt/minion
-#log_file: file:///dev/log
-#log_file: udp://loghost:10514
-#
-log_file: {{ log_file }}
+log_file: file:///dev/log
 
 # The level of messages to send to the console.
 # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
diff --git a/interface-definitions/salt-minion.xml.in b/interface-definitions/salt-minion.xml.in
index 02501c5e8..f62465a64 100644
--- a/interface-definitions/salt-minion.xml.in
+++ b/interface-definitions/salt-minion.xml.in
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!--Salt-minion configuration -->
 <interfaceDefinition>
   <node name="service">
     <children>
@@ -14,44 +13,6 @@
               <help>The hash_type is the hash to use when discovering the hash of a file on the master server.</help>
             </properties>
           </leafNode>
-          <leafNode name="log_file">
-            <properties>
-              <help>The location of the minion log file.</help>
-            </properties>
-          </leafNode>
-          <leafNode name="log_level">
-            <properties>
-              <help>Log level</help>
-              <valueHelp>
-                <format>garbage</format>
-                <description>log garbage info</description>
-              </valueHelp>
-              <valueHelp>
-                <format>trace</format>
-                <description>log trace info</description>
-              </valueHelp>
-              <valueHelp>
-                <format>debug</format>
-                <description>log debug info</description>
-              </valueHelp>
-              <valueHelp>
-                <format>info</format>
-                <description>log info</description>
-              </valueHelp>
-              <valueHelp>
-                <format>warning</format>
-                <description>log warning info</description>
-              </valueHelp>
-              <valueHelp>
-                <format>error</format>
-                <description>log error info</description>
-              </valueHelp>
-              <valueHelp>
-                <format>critical</format>
-                <description>log critical info</description>
-              </valueHelp>
-            </properties>
-          </leafNode>
           <leafNode name="master">
             <properties>
               <help>The hostname or IP address of the master.</help>
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index a460c95b3..d3412b7ef 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -31,7 +31,6 @@ master_keyfile = r'/opt/vyatta/etc/config/salt/pki/minion/master_sign.pub'
 
 default_config_data = {
     'hash_type': 'sha256',
-    'log_file': '/var/log/salt/minion',
     'log_level': 'warning',
     'master' : 'salt',
     'user': 'nobody',
@@ -55,12 +54,6 @@ def get_config():
     if conf.exists(['hash_type']):
         salt['hash_type'] = conf.return_value(['hash_type'])
 
-    if conf.exists(['log_file']):
-        salt['log_file'] = conf.return_value(['log_file'])
-
-    if conf.exists(['log_level']):
-        salt['log_level'] = conf.return_value(['log_level'])
-
     if conf.exists(['master']):
         salt['master'] = conf.return_values(['master'])
 
@@ -90,6 +83,7 @@ def generate(salt):
         dirname = os.path.dirname(file)
         if not os.path.exists(dirname):
             os.mkdir(dirname)
+            chown(dirname, salt['user'], salt['group'])
 
     render(config_file, 'salt-minion/minion.tmpl', salt)
     chown(config_file, salt['user'], salt['group'])