Merge pull request #1666 from progrium/1572_mh-nginx-logrotate

revert dokku group changes and add dokku user to adm group

plugins/nginx-vhosts/install

@@ -36,10 +36,11 @@ fi
 
 echo 'server_names_hash_bucket_size 512;' >| /etc/nginx/conf.d/server_names_hash_bucket_size.conf
 
-# make sure dokku can read the default log dir
-gpasswd -M "$(egrep ^adm: /etc/group | awk -F ":" '{ print $4 }')" dokku
-chgrp -R dokku /var/log/nginx
-chmod g+r /var/log/nginx
+# revert dokku group changes
+gpasswd -a dokku adm
+chgrp -R adm /var/log/nginx
+gpasswd -M "" dokku
+[[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx
 
 # patch broken nginx 1.8.0 logrotate
 [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/invoke-rc.d/service/g' /etc/logrotate.d/nginx