505551 Merge branch 'nginx_keyserver' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'nginx_keyserver' into 'production'
    
    add the keyserver1.o.o nginx configs
    
    See merge request infra/salt!169