Skip to content

Commit

Permalink
ncm-metaconfig: ssh: use lowercase yes/no for boolean (cfr the man pa…
Browse files Browse the repository at this point in the history
…ges)
  • Loading branch information
stdweird committed Jun 10, 2020
1 parent 0c57a42 commit 960fa64
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion ncm-metaconfig/src/main/metaconfig/ssh/client_attrs.tt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SetEnv [% item.key %]="[% item.value %]"
[% CASE -%]
[% pair.key %] [% -%]
[% IF pair.value.is_boolean -%]
[% pair.value ? 'Yes' : 'No' -%]
[% pair.value ? 'yes' : 'no' -%]
[% ELSIF CCM.is_list(pair.value) -%]
[% pair.value.join(',') -%]
[% ELSE -%]
Expand Down
2 changes: 1 addition & 1 deletion ncm-metaconfig/src/main/metaconfig/ssh/server_attrs.tt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SetEnv [% item.key %]="[% item.value %]"
[% CASE -%]
[% pair.key %] [% -%]
[% IF pair.value.is_boolean -%]
[% pair.value ? 'Yes' : 'No' -%]
[% pair.value ? 'yes' : 'no' -%]
[% ELSIF CCM.is_list(pair.value) -%]
[% pair.value.join(' ') -%]
[% ELSE -%]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,102 +4,102 @@ Base test for all ssh client config options
---
^AddKeysToAgent\sconfirm$
^AddressFamily\sany$
^BatchMode\sYes$
^BatchMode\syes$
^BindAddress\s192\.168\.1\.1$
^CASignatureAlgorithms\sssh-ed25519,rsa-sha2-512$
^CanonicalDomains\s\.com,\.eu$
^CanonicalizeFallbackLocal\sYes$
^CanonicalizeFallbackLocal\syes$
^CanonicalizeHostname\salways$
^CanonicalizePermittedCNAMEs\s\*\.a\.example\.com:\*\.b\.example\.com,\*\.c\.example\.com$
^CertificateFile\s/absolute/path$
^CertificateFile\s~/home/relative$
^ChallengeResponseAuthentication\sNo$
^CheckHostIP\sYes$
^ChallengeResponseAuthentication\sno$
^CheckHostIP\syes$
^Cipher\s3des$
^Ciphers\schacha20-poly1305@openssh\.com,arcfour256,arcfour128,aes128-cbc,3des-cbc$
^ClearAllForwardings\sYes$
^Compression\sNo$
^ClearAllForwardings\syes$
^Compression\sno$
^CompressionLevel\s7$
^ConnectTimeout\s10$
^ConnectionAttempts\s3$
^ControlMaster\sask$
^ControlPath\s%l%h%p%r$
^ControlPersist\sno$
^DynamicForward\s192\.168\.1\.2$
^EnableSSHKeysign\sYes$
^EnableSSHKeysign\syes$
^EscapeChar\s~$
^ExitOnForwardFailure\sYes$
^ExitOnForwardFailure\syes$
^FingerprintHash\ssha256$
^ForwardAgent\sYes$
^ForwardX11\sNo$
^ForwardAgent\syes$
^ForwardX11\sno$
^ForwardX11Timeout\s10$
^ForwardX11Trusted\sNo$
^GSSAPIAuthentication\sNo$
^ForwardX11Trusted\sno$
^GSSAPIAuthentication\sno$
^GSSAPIClientIdentity\scustom$
^GSSAPIDelegateCredentials\sNo$
^GSSAPIKeyExchange\sYes$
^GSSAPIRenewalForcesRekey\sYes$
^GSSAPIDelegateCredentials\sno$
^GSSAPIKeyExchange\syes$
^GSSAPIRenewalForcesRekey\syes$
^GSSAPIServerIdentity\sserver@principal$
^GSSAPITrustDns\sNo$
^GatewayPorts\sNo$
^GSSAPITrustDns\sno$
^GatewayPorts\sno$
^GlobalKnownHostsFile\s/etc/ssh/ssh_known_hosts\s/etc/ssh/ssh_known_hosts2$
^HashKnownHosts\sNo$
^HashKnownHosts\sno$
^HostKeyAlgorithms\sssh-rsa-cert-v01@openssh\.com,ssh-dss-cert-v01@openssh\.com$
^HostKeyAlias\shostname2$
^HostName\s%h$
^HostbasedAuthentication\sYes$
^HostbasedAuthentication\syes$
^HostbasedKeyTypes\s\*$
^IPQoS\sthroughput$
^IdentitiesOnly\sYes$
^IdentitiesOnly\syes$
^IdentityAgent\snone$
^IdentityFile\s~/\.ssh/identity$
^IdentityFile\s~/\.ssh/id_rsa$
^IdentityFile\s~/\.ssh/id_dsa$
^IgnoreUnknown\sIPQoS\sKbdInteractiveAuthentication$
^Include\s/absolute/path\s~/home/relative\ssshconf_relative$
^KbdInteractiveAuthentication\sYes$
^KbdInteractiveAuthentication\syes$
^KbdInteractiveDevices\spam,skey$
^KexAlgorithms\secdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521$
^LocalCommand\sls$
^LocalForward\s\*$
^LogLevel\sDEBUG3$
^MACs\shmac-sha1-96-etm@openssh\.com,hmac-md5-96-etm@openssh\.com$
^NoHostAuthenticationForLocalhost\sYes$
^NoHostAuthenticationForLocalhost\syes$
^NumberOfPasswordPrompts\s9$
^PKCS11Provider\s/usr/lib/opensc-pkcs11\.so$
^PasswordAuthentication\sNo$
^PermitLocalCommand\sNo$
^PasswordAuthentication\sno$
^PermitLocalCommand\sno$
^Port\s22$
^PreferredAuthentications\sgssapi-with-mic,hostbased,publickey$
^Protocol\s2$
^ProxyCommand\sssh\s-q\s-W\s%h:%p\sgateway\.example\.com$
^ProxyJump\suser1@host1,user2@host2$
^ProxyUseFdpass\sNo$
^ProxyUseFdpass\sno$
^PubkeyAcceptedKeyTypes\s-ssh-rsa$
^PubkeyAuthentication\sYes$
^RSAAuthentication\sYes$
^PubkeyAuthentication\syes$
^RSAAuthentication\syes$
^RekeyLimit\s1G$
^RemoteCommand\scat /etc/motd$
^RemoteForward\s\*$
^RequestTTY\sforce$
^RevokedHostKeys\s~/\.ssh/revokedkeys\.txt$
^RhostsRSAAuthentication\sYes$
^RhostsRSAAuthentication\syes$
^SendEnv\sLANG\sLC_CTYPE\sLC_NUMERIC\sLC_TIME$
^ServerAliveCountMax\s4$
^ServerAliveInterval\s0$
^SetEnv\sLC_ALL="C"$
^SetEnv\sTERM="xterm"$
^StreamLocalBindMask\s0177$
^StreamLocalBindUnlink\sNo$
^StreamLocalBindUnlink\sno$
^StrictHostKeyChecking\sask$
^SyslogFacility\sLOCAL1$
^TCPKeepAlive\sYes$
^TCPKeepAlive\syes$
^Tunnel\sethernet$
^TunnelDevice\stun0$
^UpdateHostKeys\sask$
^UsePrivilegedPort\sNo$
^UsePrivilegedPort\sno$
^User\stestuser$
^UserKnownHostsFile\s~/\.ssh/known_hosts\s~/\.ssh/known_hosts2$
^VerifyHostKeyDNS\sask$
^VisualHostKey\sYes$
^VisualHostKey\syes$
^XAuthLocation\s/usr/X11R6/bin/xauth$
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Base test for ssh client config
^IdentityFile\s~/.ssh/id_dsa$
^$
^Match\suser\stestuser2\soriginalhost\shostname4$
^\s{4}BatchMode\sYes$
^\s{4}ForwardX11\sNo$
^\s{4}BatchMode\syes$
^\s{4}ForwardX11\sno$
^\s{4}NumberOfPasswordPrompts\s1$
^$
^Host\shostname.example.com\shostname4.example.com$
Expand All @@ -23,7 +23,7 @@ Base test for ssh client config
^\s{4}VerifyHostKeyDNS\sask$
^$
^Host\s\*$
^\s{4}ForwardX11Trusted\sYes$
^\s{4}GSSAPIAuthentication\sYes$
^\s{4}ForwardX11Trusted\syes$
^\s{4}GSSAPIAuthentication\syes$
^\s{4}SendEnv\sLANG\sLC_CTYPE\sLC_NUMERIC\sLC_TIME\sLC_ALL\sLC_MESSAGES\sLANGUAGE\sXMODIFIERS$
^$
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Base test for all ssh server config options
---
^AcceptEnv\sLC_CTYPE\sLANG\sTERM$
^AddressFamily\sany$
^AllowAgentForwarding\sNo$
^AllowAgentForwarding\sno$
^AllowGroups\swheel$
^AllowStreamLocalForwarding\slocal$
^AllowTcpForwarding\slocal$
Expand All @@ -17,40 +17,40 @@ Base test for all ssh server config options
^AuthorizedPrincipalsCommandUser\sprincuser$
^AuthorizedPrincipalsFile\s/etc/ssh/x509_users\s\.ssh/x509_users$
^Banner\sConfigured by Quattor$
^ChallengeResponseAuthentication\sNo$
^ChallengeResponseAuthentication\sno$
^ChrootDirectory\s/srv/ssh$
^Ciphers\[email protected],arcfour256,arcfour128,aes128-cbc,3des-cbc$
^ClientAliveCountMax\s3$
^ClientAliveInterval\s30$
^Compression\sNo$
^Compression\sno$
^DenyGroups\sadm$
^DenyUsers\sroot$
^DisableForwarding\sNo$
^ExposeAuthInfo\sNo$
^DisableForwarding\sno$
^ExposeAuthInfo\sno$
^FingerprintHash\ssha256$
^ForceCommand\scat\s/etc/motd$
^GSSAPIAuthentication\sYes$
^GSSAPICleanupCredentials\sYes$
^GSSAPIKeyExchange\sYes$
^GSSAPIStoreCredentialsOnRekey\sYes$
^GSSAPIStrictAcceptorCheck\sYes$
^GSSAPIAuthentication\syes$
^GSSAPICleanupCredentials\syes$
^GSSAPIKeyExchange\syes$
^GSSAPIStoreCredentialsOnRekey\syes$
^GSSAPIStrictAcceptorCheck\syes$
^GatewayPorts\sclientspecified$
^HostCertificate\s/etc/ssh/ssh_host_cert.pem$
^HostKey\s/etc/ssh/ssh_host_rsa_key$
^HostKey\s/etc/ssh/ssh_host_ed25519_key$
^HostKeyAgent\s/run/ssh/key_agent\.socket$
^HostKeyAlgorithms\secdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521$
^HostbasedAcceptedKeyTypes\s-ssh-rsa$
^HostbasedAuthentication\sYes$
^HostbasedUsesNameFromPacketOnly\sNo$
^HostbasedAuthentication\syes$
^HostbasedUsesNameFromPacketOnly\sno$
^IPQoS\slowdelay\sthroughput$
^IgnoreRhosts\sYes$
^IgnoreUserKnownHosts\sYes$
^KbdInteractiveAuthentication\sYes$
^KerberosAuthentication\sNo$
^KerberosGetAFSToken\sNo$
^KerberosOrLocalPasswd\sNo$
^KerberosTicketCleanup\sYes$
^IgnoreRhosts\syes$
^IgnoreUserKnownHosts\syes$
^KbdInteractiveAuthentication\syes$
^KerberosAuthentication\sno$
^KerberosGetAFSToken\sno$
^KerberosOrLocalPasswd\sno$
^KerberosTicketCleanup\syes$
^KexAlgorithms\secdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521$
^ListenAddress\s127\.0\.0\.1:22$
^ListenAddress\s192\.168\.0\.1:22$
Expand All @@ -61,39 +61,39 @@ Base test for all ssh server config options
^MaxAuthTries\s3$
^MaxSessions\s10$
^MaxStartups\s10:30:100$
^PasswordAuthentication\sNo$
^PermitEmptyPasswords\sNo$
^PasswordAuthentication\sno$
^PermitEmptyPasswords\sno$
^PermitListen\s8080\s127\.0\.0\.1:\*$
^PermitOpen\s8080\s192\.168\.0\.1:\*$
^PermitRootLogin\sprohibit-password$
^PermitTTY\sYes$
^PermitTTY\syes$
^PermitTunnel\spoint-to-point$
^PermitUserEnvironment\sNo$
^PermitUserRC\sNo$
^PermitUserEnvironment\sno$
^PermitUserRC\sno$
^PidFile\s/run/sshd\.pid$
^Port\s22$
^Port\s2200$
^PrintLastLog\sYes$
^PrintMotd\sYes$
^PrintLastLog\syes$
^PrintMotd\syes$
^PubkeyAcceptedKeyTypes\s-ssh-rsa$
^PubkeyAuthentication\sYes$
^PubkeyAuthentication\syes$
^RDomain\s%D$
^RSAAuthentication\sNo$
^RSAAuthentication\sno$
^RekeyLimit\s1G\s300s$
^RevokedKeys\s/etc/ssh/revoked_keys$
^RhostsRSAAuthentication\sNo$
^RhostsRSAAuthentication\sno$
^SetEnv\sLC_ALL="C"$
^SetEnv\sTERM="xterm"$
^StreamLocalBindMask\s0177$
^StreamLocalBindUnlink\sNo$
^StreamLocalBindUnlink\sno$
^Subsystem\ssftp\sinternal-sftp$
^SyslogFacility\sAUTH$
^TCPKeepAlive\sYes$
^TCPKeepAlive\syes$
^TrustedUserCAKeys\s/etc/ssh/trusted_cas$
^UseDNS\sYes$
^UsePAM\sYes$
^UseDNS\syes$
^UsePAM\syes$
^VersionAddendum\sextra$
^X11DisplayOffset\s10$
^X11Forwarding\sYes$
^X11UseLocalHost\sYes$
^X11Forwarding\syes$
^X11UseLocalHost\syes$
^XAuthLocation\s/usr/bin/xauth$
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Base test for ssh server config
---
^AddressFamily\sany$
^Ciphers\saes128-ctr,aes192-ctr,aes256-ctr$
^PasswordAuthentication\sNo$
^PasswordAuthentication\sno$
^Match\sUser\stestuser2\sAddress\s192.168.0.0/16$
^\s{4}PasswordAuthentication\sYes$
^\s{4}PasswordAuthentication\syes$

0 comments on commit 960fa64

Please sign in to comment.