071322 Merge branch 'nginx-ng' into 'production'

Merged and Committed by Christian Boltz 5 months ago
    Merge branch 'nginx-ng' into 'production'
    
    Migrate nginx.ng to nginx, update nginx formula pillars
    
    See merge request infra/salt!1222
        
file modified
+1 -1
file modified
+21 -24
file modified
+27 -28
file modified
+183 -187
file modified
+49 -52
file modified
+70 -76
file modified
+22 -25
file modified
+71 -74
file modified
+21 -24
file modified
+16 -20
file modified
+141 -153
file modified
+70 -74
file modified
+62 -62
file modified
+22 -25