Merge 3b225db27e into 1553a9d5bc

apache/config/file.sls

 apache-config-file-directory-logdir:
   file.directory:
     - name: {{ apache.logdir }}
-    - user: {{ apache.user }}
-    - group: {{ apache.group }}
+    - user: {{ apache.get('logdir_user', apache.user) }}
+    - group: {{ apache.get('logdir_group', apache.group) }}
     - makedirs: True
     - require:
       - sls: {{ sls_package_install }}
 
 apache-config-file-managed-{{ grains.os }}-env:
   file.managed:
-    - name: /etc/apache2/envvars
+    - name: {{ apache.envvarsfile }}
     - source: 'salt://apache/files/{{ grains.os_family }}/envvars-{{ apache.version }}.jinja'
     - mode: 644
     - user: {{ apache.rootuser }}

apache/config/logrotate.sls

                 /bin/systemctl reload {{ apache.service.name }}.service > /dev/null 2>/dev/null || true
             endscript
          }
+    {% elif grains.os_family == "FreeBSD" %}
+    - contents: |
+        {{ apache.logdir }}/httpd-*.log {
+                daily
+                missingok
+                rotate 14
+                compress
+                delaycompress
+                notifempty
+                create 640 root wheel
+                sharedscripts
+                postrotate
+                    if service {{ apache.service.name }} status >/dev/null; then \
+                        service {{ apache.service.name }} reload >/dev/null; \
+                    fi;
+                endscript
+                prerotate
+                    if [ -d /usr/local/etc/logrotate.d/httpd-prerotate ]; then \
+                       run-parts /usr/local/etc/logrotate.d/httpd-prerotate; \
+                    fi; \
+                endscript
     {% else %}
     - contents: |
         {{ apache.logdir }}/*.log {

apache/defaults.yaml

     name: apache
   user: www-data
   group: www-data
+  envvarsfile: /etc/apache2/envvars
   vhostdir: /etc/apache2/sites-available
   confdir: /etc/apache2/conf.d
   davlockdbdir: null

apache/osfamilymap.yaml

   group: www
   config: /usr/local/etc/apache24/httpd.conf
   portsfile: /usr/local/etc/apache24/ports.conf
+  envvarsfile: /usr/local/etc/apache24/envvars.d/by_salt.env
 
   mod_php5: mod_php56
   mod_perl2: ap24-mod_perl2
   default_site: default
   default_site_ssl: default-ssl
   moddir: /usr/local/etc/apache24/modules.d
-  logdir: /var/log/
+  logdir: /var/log
+  logdir_user: root
+  logdir_group: wheel
   logrotatedir: /usr/local/etc/logrotate.d/apache2
   wwwdir: /usr/local/www/apache24/