Compare commits

..

No commits in common. "8ebf4e0ec011b48be1f7802607b13391af9d16be" and "c128b8a1ca24d357423a776dec7fe8cca2bf4678" have entirely different histories.

3 changed files with 3 additions and 21 deletions

View file

@ -21,4 +21,3 @@ ClientAliveInterval 30
ClientAliveCountMax 5 ClientAliveCountMax 5
AcceptEnv LANG AcceptEnv LANG
Subsystem sftp /usr/lib/openssh/sftp-server Subsystem sftp /usr/lib/openssh/sftp-server
HostKey /etc/ssh/ssh_host_managed_key

View file

@ -51,14 +51,14 @@ files = {
], ],
'skip': dont_touch_sshd, 'skip': dont_touch_sshd,
}, },
'/etc/ssh/ssh_host_managed_key': { '/etc/ssh/ssh_host_ed25519_key': {
'content': node.metadata.get('ssh/host_key/private') + '\n', 'content': node.metadata.get('ssh/host_key/private') + '\n',
'mode': '0600', 'mode': '0600',
'triggers': [ 'triggers': [
'svc_systemd:ssh:restart' 'svc_systemd:ssh:restart'
], ],
}, },
'/etc/ssh/ssh_host_managed_key.pub': { '/etc/ssh/ssh_host_ed25519_key.pub': {
'content': node.metadata.get('ssh/host_key/public') + '\n', 'content': node.metadata.get('ssh/host_key/public') + '\n',
'mode': '0644', 'mode': '0644',
'triggers': [ 'triggers': [

View file

@ -9,7 +9,6 @@ directories = {
] ]
}, },
'/etc/zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions': { '/etc/zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions': {
'mode': '0755',
'needs': [ 'needs': [
f"git_deploy:/etc/zsh/oh-my-zsh", f"git_deploy:/etc/zsh/oh-my-zsh",
] ]
@ -28,30 +27,14 @@ git_deploy = {
} }
files = { files = {
'/etc/zsh/zprofile': { '/etc/zsh/zprofile': {},
'mode': '0755',
},
'/etc/zsh/oh-my-zsh/themes/bw.zsh-theme': { '/etc/zsh/oh-my-zsh/themes/bw.zsh-theme': {
'mode': '0755',
'needs': [ 'needs': [
f"git_deploy:/etc/zsh/oh-my-zsh", f"git_deploy:/etc/zsh/oh-my-zsh",
] ]
}, },
} }
actions = {
'chown_oh_my_zsh': {
'command': 'chmod -R 755 /etc/zsh/oh-my-zsh',
'triggered': True,
'triggered_by': [
"git_deploy:/etc/zsh/oh-my-zsh",
"git_deploy:/etc/zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions",
"file:/etc/zsh/zprofile",
"file:/etc/zsh/oh-my-zsh/themes/bw.zsh-theme",
],
},
}
for name, user_config in node.metadata.get('users').items(): for name, user_config in node.metadata.get('users').items():
if user_config.get('shell', None) == '/usr/bin/zsh': if user_config.get('shell', None) == '/usr/bin/zsh':
files[join(user_config['home'], '.zshrc')] = { files[join(user_config['home'], '.zshrc')] = {