Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to improve spacing in generated configs (Issue #742) #891

Merged
merged 1 commit into from
Sep 29, 2016
Merged

try to improve spacing in generated configs (Issue #742) #891

merged 1 commit into from
Sep 29, 2016

Conversation

wyardley
Copy link
Collaborator

I think this should make at least some improvement w/r/t #742, would love to see some folks test this in the wild, but at the least, should only affect spacing.

Based on the example configs in the acceptance tests, at least, the spacing looks Ok to me.

root@ubuntu-server-1404-x64:/etc/nginx/sites-available# cat www.puppetlabs.com.conf 
# MANAGED BY PUPPET
server {
  listen *:80;
  server_name           www.puppetlabs.com;

  index  index.html index.htm index.php;

  access_log            /var/log/nginx/www.puppetlabs.com.access.log combined;
  error_log             /var/log/nginx/www.puppetlabs.com.error.log;

  location / {
    root      /var/www/www.puppetlabs.com;
    index     index.html index.htm index.php;
  }
}
# MANAGED BY PUPPET
server {
  listen       *:443 ssl;
  server_name  www.puppetlabs.com;

  ssl on;

  ssl_certificate           /etc/pki/tls/certs/blah.cert;
  ssl_certificate_key       /etc/pki/tls/private/blah.key;
  ssl_session_cache         shared:SSL:10m;
  ssl_session_timeout       5m;
  ssl_protocols             TLSv1 TLSv1.1 TLSv1.2;
  ssl_ciphers               ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA;
  ssl_prefer_server_ciphers on;

  index  index.html index.htm index.php;

  access_log            /var/log/nginx/ssl-www.puppetlabs.com.access.log combined;
  error_log             /var/log/nginx/ssl-www.puppetlabs.com.error.log;

  location / {
    root      /var/www/www.puppetlabs.com;
    index     index.html index.htm index.php;
  }
}

nginx.conf has some single lines breaking up sections of the main config, but I think it looks Ok.

@wyardley wyardley mentioned this pull request Sep 29, 2016
@bastelfreak
Copy link
Member

Thanks @wyardley! (feel free to merge a PR when somebody else approved it)

@bastelfreak bastelfreak merged commit 675cd7a into voxpupuli:master Sep 29, 2016
@wyardley wyardley deleted the issues_742 branch October 27, 2016 17:16
Rubueno pushed a commit to Rubueno/puppet-nginx that referenced this pull request Oct 19, 2020
try to improve spacing in generated configs (Issue voxpupuli#742)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants