Skip to content

Commit ad3bf02

Browse files
jrhajrha
committed
ncm-metaconfig: httpd: Fix lint issues
1 parent 65498f9 commit ad3bf02

File tree

7 files changed

+85
-17
lines changed

7 files changed

+85
-17
lines changed

‎ncm-metaconfig/src/main/metaconfig/httpd/2.2/tests/profiles/graphite-web.pan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ variable HOSTNAME = 'myhost';
1414
variable DB_IP = dict(HOSTNAME, '1.2.3.4');
1515

1616
"/software/components/metaconfig/services/{/etc/httpd/conf.d/graphite-web.conf}/contents/vhosts/graphiteweb" = {
17-
base=create(format('struct/ssl_conf_%s', HTTPD_OS_FLAVOUR));
17+
base = create(format('struct/ssl_conf_%s', HTTPD_OS_FLAVOUR));
1818

19-
pubvhost=create('struct/public_vhost');
19+
pubvhost = create('struct/public_vhost');
2020

21-
foreach(idx;val;list('certificatefile', 'certificatekeyfile', 'cacertificatefile')) {
21+
foreach(idx; val; list('certificatefile', 'certificatekeyfile', 'cacertificatefile')) {
2222
base['vhosts']['base']['ssl'][val] = pubvhost['ssl'][val];
2323
};
2424

‎ncm-metaconfig/src/main/metaconfig/httpd/2.2/tests/profiles/struct/default_vhost.pan‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ structure template struct/default_vhost;
1818
"log/level" = "warn";
1919
"log/error" = format("logs/%s_%s_error_log", value("servername"), value("port"));
2020
"log/transfer" = format("logs/%s_%s_access_log", value("servername"), value("port"));
21-
"log/custom"=append(dict(
21+
"log/custom" = append(dict(
2222
"location", format("logs/%s_%s_request_log", value("servername"), value("port")),
2323
"name", "ssl_combined",
2424
));

‎ncm-metaconfig/src/main/metaconfig/httpd/2.2/tests/profiles/struct/nss_conf_el6.pan‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,25 @@ structure template struct/nss_conf_el6;
4747
"vhosts/base/nss/engine" = true;
4848
# SSLv3,TLSv1.0,TLSv1.1
4949
"vhosts/base/nss/protocol" = list("TLSv1.0");
50-
"vhosts/base/nss/ciphersuite" = list('+rsa_3des_sha', '-rsa_des_56_sha', '+rsa_des_sha', '-rsa_null_md5', '-rsa_null_sha', '-rsa_rc2_40_md5', '+rsa_rc4_128_md5', '-rsa_rc4_128_sha', '-rsa_rc4_40_md5', '-rsa_rc4_56_sha', '-fortezza', '-fortezza_rc4_128_sha', '-fortezza_null', '-fips_des_sha', '+fips_3des_sha', '-rsa_aes_128_sha', '-rsa_aes_256_sha');
50+
"vhosts/base/nss/ciphersuite" = list(
51+
'+rsa_3des_sha',
52+
'-rsa_des_56_sha',
53+
'+rsa_des_sha',
54+
'-rsa_null_md5',
55+
'-rsa_null_sha',
56+
'-rsa_rc2_40_md5',
57+
'+rsa_rc4_128_md5',
58+
'-rsa_rc4_128_sha',
59+
'-rsa_rc4_40_md5',
60+
'-rsa_rc4_56_sha',
61+
'-fortezza',
62+
'-fortezza_rc4_128_sha',
63+
'-fortezza_null',
64+
'-fips_des_sha',
65+
'+fips_3des_sha',
66+
'-rsa_aes_128_sha',
67+
'-rsa_aes_256_sha',
68+
);
5169
"vhosts/base/nss/certificatedatabase" = "/etc/httpd/alias";
5270

5371

@@ -64,4 +82,3 @@ structure template struct/nss_conf_el6;
6482
"options", list("+StdEnvVars"),
6583
),
6684
));
67-

‎ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/profiles/graphite-web.pan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ variable HOSTNAME = 'myhost';
1414
variable DB_IP = dict(HOSTNAME, '1.2.3.4');
1515

1616
"/software/components/metaconfig/services/{/etc/httpd/conf.d/graphite-web.conf}/contents/vhosts/graphiteweb" = {
17-
base=create(format('struct/ssl_conf_%s', HTTPD_OS_FLAVOUR));
17+
base = create(format('struct/ssl_conf_%s', HTTPD_OS_FLAVOUR));
1818

19-
pubvhost=create('struct/public_vhost');
19+
pubvhost = create('struct/public_vhost');
2020

21-
foreach(idx;val;list('certificatefile', 'certificatekeyfile', 'cacertificatefile')) {
21+
foreach(idx; val; list('certificatefile', 'certificatekeyfile', 'cacertificatefile')) {
2222
base['vhosts']['base']['ssl'][val] = pubvhost['ssl'][val];
2323
};
2424

‎ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/profiles/krb5_profiles.pan‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,23 @@ prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_profile
4040

4141
'nss/engine' = true;
4242
# SSL 3 ciphers minues rc4 and 3des. SSL 2 is disabled by default.
43-
'nss/ciphersuite' = list('-rsa_rc4_128_md5', '-rsa_rc4_128_sha', '-rsa_3des_sha', '-rsa_des_sha', '-rsa_rc4_40_md5',
44-
'-rsa_rc2_40_md5', '-rsa_null_md5', '-rsa_null_sha', '-fips_3des_sha','-fips_des_sha', '-fortezza',
45-
'-fortezza_rc4_128_sha', '-fortezza_null', '-rsa_des_56_sha', '-rsa_rc4_56_sha', '+rsa_aes_128_sha',
43+
'nss/ciphersuite' = list(
44+
'-rsa_rc4_128_md5',
45+
'-rsa_rc4_128_sha',
46+
'-rsa_3des_sha',
47+
'-rsa_des_sha',
48+
'-rsa_rc4_40_md5',
49+
'-rsa_rc2_40_md5',
50+
'-rsa_null_md5',
51+
'-rsa_null_sha',
52+
'-fips_3des_sha',
53+
'-fips_des_sha',
54+
'-fortezza',
55+
'-fortezza_rc4_128_sha',
56+
'-fortezza_null',
57+
'-rsa_des_56_sha',
58+
'-rsa_rc4_56_sha',
59+
'+rsa_aes_128_sha',
4660
'+rsa_aes_256_sha',
4761
);
4862
'nss/protocol' = list('TLSv1.0', 'TLSv1.1', 'TLSv1.2');
@@ -57,7 +71,8 @@ prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_profile
5771
'name', "ssl_combined",
5872
));
5973

60-
prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_profiles.conf}/contents/vhosts/profiles/directories/0";
74+
prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_profiles.conf}";
75+
prefix "contents/vhosts/profiles/directories/0";
6176
"name" = "/var/www/https/profiles";
6277
"rewrite/rules/0/conditions/0" = dict(
6378
"test", "${ACLmap:%{REMOTE_HOST}|NO}",

‎ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/profiles/krb5_sunstone.pan‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,25 @@ prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_sunston
3131

3232
'nss/engine' = true;
3333
# SSL 3 ciphers minus rc4 and 3des. SSL 2 is disabled by default.
34-
'nss/ciphersuite' = list('-rsa_rc4_128_md5', '-rsa_rc4_128_sha', '-rsa_3des_sha', '-rsa_des_sha', '-rsa_rc4_40_md5', '-rsa_rc2_40_md5', '-rsa_null_md5', '-rsa_null_sha', '-fips_3des_sha','-fips_des_sha', '-fortezza', '-fortezza_rc4_128_sha', '-fortezza_null', '-rsa_des_56_sha', '-rsa_rc4_56_sha', '+rsa_aes_128_sha', '+rsa_aes_256_sha');
34+
'nss/ciphersuite' = list(
35+
'-rsa_rc4_128_md5',
36+
'-rsa_rc4_128_sha',
37+
'-rsa_3des_sha',
38+
'-rsa_des_sha',
39+
'-rsa_rc4_40_md5',
40+
'-rsa_rc2_40_md5',
41+
'-rsa_null_md5',
42+
'-rsa_null_sha',
43+
'-fips_3des_sha',
44+
'-fips_des_sha',
45+
'-fortezza',
46+
'-fortezza_rc4_128_sha',
47+
'-fortezza_null',
48+
'-rsa_des_56_sha',
49+
'-rsa_rc4_56_sha',
50+
'+rsa_aes_128_sha',
51+
'+rsa_aes_256_sha',
52+
);
3553
'nss/protocol' = list('TLSv1.0', 'TLSv1.1', 'TLSv1.2');
3654
'nss/nickname' = 'Server-Cert';
3755
'nss/certificatedatabase' = '/etc/httpd/alias';
@@ -44,7 +62,8 @@ prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_sunston
4462
'name', "ssl_combined",
4563
));
4664

47-
prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_sunstone.conf}/contents/vhosts/sunstone/directories/0";
65+
prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/krb5_sunstone.conf}";
66+
prefix "contents/vhosts/sunstone/directories/0";
4867
"name" = SUNSTONE_PUBLIC_DIR;
4968
'auth/require' = dict("type", "valid-user");
5069
'auth/name' = "Sunstone Kerberos Login";

‎ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/profiles/struct/nss_conf_el6.pan‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,25 @@ structure template struct/nss_conf_el6;
4747
"vhosts/base/nss/engine" = true;
4848
# SSLv3,TLSv1.0,TLSv1.1 minus 3des and rc4
4949
"vhosts/base/nss/protocol" = list("TLSv1.0");
50-
"vhosts/base/nss/ciphersuite" = list('-rsa_3des_sha', '-rsa_des_56_sha', '-rsa_des_sha', '-rsa_null_md5', '-rsa_null_sha', '-rsa_rc2_40_md5', '-rsa_rc4_128_md5', '-rsa_rc4_128_sha', '-rsa_rc4_40_md5', '-rsa_rc4_56_sha', '-fortezza', '-fortezza_rc4_128_sha', '-fortezza_null', '-fips_des_sha', '-fips_3des_sha', '-rsa_aes_128_sha', '-rsa_aes_256_sha');
50+
"vhosts/base/nss/ciphersuite" = list(
51+
'-rsa_3des_sha',
52+
'-rsa_des_56_sha',
53+
'-rsa_des_sha',
54+
'-rsa_null_md5',
55+
'-rsa_null_sha',
56+
'-rsa_rc2_40_md5',
57+
'-rsa_rc4_128_md5',
58+
'-rsa_rc4_128_sha',
59+
'-rsa_rc4_40_md5',
60+
'-rsa_rc4_56_sha',
61+
'-fortezza',
62+
'-fortezza_rc4_128_sha',
63+
'-fortezza_null',
64+
'-fips_des_sha',
65+
'-fips_3des_sha',
66+
'-rsa_aes_128_sha',
67+
'-rsa_aes_256_sha',
68+
);
5169
"vhosts/base/nss/certificatedatabase" = "/etc/httpd/alias";
5270

5371

@@ -64,4 +82,3 @@ structure template struct/nss_conf_el6;
6482
"options", list("+StdEnvVars"),
6583
),
6684
));
67-

0 commit comments

Comments
 (0)