4354d6 Merge branch 'properly_encrypt_certs' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'properly_encrypt_certs' into 'production'
    
    encrypt the certificates properly into pillars
    
    See merge request infra/salt!164
        
file modified
+13 -4
file modified
+27 -3