Projet

Général

Profil

Révision 61f03b47

ID61f03b478ce5657ec83272d1b3750cd7464a080a
Parent e53053ce
Enfant a5f5fb12

Ajouté par Steve Traylen il y a plus de 4 ans

Switch $order$fragmenta/b to $order-$fragment-a/b

Voir les différences:

spec/classes/masquerade_spec.rb
54 54 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-type').with(
55 55 
            target:  'nftables-ip-nat-chain-POSTROUTING',
56 56 
            content: %r{^  type nat hook postrouting priority 100$},
57 
            order:   '01nftables-ip-nat-chain-POSTROUTING-rule-typeb',
57 
            order:   '01-nftables-ip-nat-chain-POSTROUTING-rule-type-b',
58 58 
          )
59 59 
        }
60 60 
        it {
61 61 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-policy').with(
62 62 
            target:  'nftables-ip-nat-chain-POSTROUTING',
63 63 
            content: %r{^  policy accept$},
64 
            order:   '02nftables-ip-nat-chain-POSTROUTING-rule-policyb',
64 
            order:   '02-nftables-ip-nat-chain-POSTROUTING-rule-policy-b',
65 65 
          )
66 66 
        }
67 67 
        it {
68 68 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-masquerade_eth0').with(
69 69 
            target:  'nftables-ip-nat-chain-POSTROUTING',
70 70 
            content: %r{^  oifname eth0 masquerade$},
71 
            order:   '70nftables-ip-nat-chain-POSTROUTING-rule-masquerade_eth0b',
71 
            order:   '70-nftables-ip-nat-chain-POSTROUTING-rule-masquerade_eth0-b',
72 72 
          )
73 73 
        }
74 74 
        it {
75 75 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-masquerade_eth1_vpn').with(
76 76 
            target:  'nftables-ip-nat-chain-POSTROUTING',
77 77 
            content: %r{^  oifname eth1 ip saddr 192\.0\.2\.0\/24 masquerade$},
78 
            order:   '70nftables-ip-nat-chain-POSTROUTING-rule-masquerade_eth1_vpnb',
78 
            order:   '70-nftables-ip-nat-chain-POSTROUTING-rule-masquerade_eth1_vpn-b',
79 79 
          )
80 80 
        }
81 81 
        it {
82 82 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-masquerade_ssh').with(
83 83 
            target:  'nftables-ip-nat-chain-POSTROUTING',
84 84 
            content: %r{^  ip saddr 192\.0\.2\.0\/24 ip daddr 198.51.100.2 tcp dport 22 masquerade$},
85 
            order:   '70nftables-ip-nat-chain-POSTROUTING-rule-masquerade_sshb',
85 
            order:   '70-nftables-ip-nat-chain-POSTROUTING-rule-masquerade_ssh-b',
86 86 
          )
87 87 
        }
88 88 
        it {
89 89 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-masquerade_ssh_gitlab').with(
90 90 
            target:  'nftables-ip-nat-chain-POSTROUTING',
91 91 
            content: %r{^  ip saddr 192\.0\.2\.0\/24 ip daddr 198.51.100.2 tcp dport 22 masquerade$},
92 
            order:   '70nftables-ip-nat-chain-POSTROUTING-rule-masquerade_ssh_gitlabb',
92 
            order:   '70-nftables-ip-nat-chain-POSTROUTING-rule-masquerade_ssh_gitlab-b',
93 93 
          )
94 94 
        }
95 95 
        it {
96 96 
          is_expected.to contain_concat__fragment('nftables-ip-nat-chain-POSTROUTING-rule-masquerade_wireguard').with(
97 97 
            target:  'nftables-ip-nat-chain-POSTROUTING',
98 98 
            content: %r{^  udp dport 51820 masquerade$},
99 
            order:   '70nftables-ip-nat-chain-POSTROUTING-rule-masquerade_wireguardb',
99 
            order:   '70-nftables-ip-nat-chain-POSTROUTING-rule-masquerade_wireguard-b',
100 100 
          )
101 101 
        }
102 102 
        it {

Formats disponibles : Unified diff