Fix bad substitution error
parent
03df2ba576
commit
cda9073a77
18
manifest.jps
18
manifest.jps
|
@ -18,12 +18,16 @@ settings:
|
||||||
description: "A user-specific directory will be created under /home/username"
|
description: "A user-specific directory will be created under /home/username"
|
||||||
required: false
|
required: false
|
||||||
- type: string
|
- type: string
|
||||||
|
inputType: text
|
||||||
name: username
|
name: username
|
||||||
caption: SFTP Username
|
caption: SFTP Username
|
||||||
|
placeholder: "Enter username"
|
||||||
description: "Enter the desired username (3-32 characters, letters, numbers, and underscores only)"
|
description: "Enter the desired username (3-32 characters, letters, numbers, and underscores only)"
|
||||||
required: true
|
required: true
|
||||||
regex: ^[a-zA-Z0-9_]{3,32}$
|
regex: ^[a-zA-Z0-9_]{3,32}$
|
||||||
regexText: "Username must be 3-32 characters long and contain only letters, numbers, and underscores"
|
regexText: "Username must be 3-32 characters long and contain only letters, numbers, and underscores"
|
||||||
|
hideLabel: false
|
||||||
|
hidden: false
|
||||||
- type: checkbox
|
- type: checkbox
|
||||||
name: allow
|
name: allow
|
||||||
caption: Accept User Creation
|
caption: Accept User Creation
|
||||||
|
@ -68,10 +72,11 @@ settings:
|
||||||
|
|
||||||
|
|
||||||
globals:
|
globals:
|
||||||
username: "${settings.username}"
|
username: "${settings.sfpform.username}"
|
||||||
password: ${fn.password(min)}
|
password: ${fn.password(min)}
|
||||||
sftpHost: ${env.domain}
|
sftpHost: ${env.domain}
|
||||||
sftpPort: 22
|
sftpPort: 22
|
||||||
|
enable_ssh: ${settings.sfpform.enable_ssh:false}
|
||||||
|
|
||||||
onInstall:
|
onInstall:
|
||||||
- cmd [cp]:
|
- cmd [cp]:
|
||||||
|
@ -85,10 +90,10 @@ onInstall:
|
||||||
- cmd[cp]:
|
- cmd[cp]:
|
||||||
user: root
|
user: root
|
||||||
commands: |-
|
commands: |-
|
||||||
if grep -qE "^Match User user[0-9]*$" /etc/ssh/sshd_config; then
|
if grep -qE "^Match User [a-zA-Z0-9_]*$" /etc/ssh/sshd_config; then
|
||||||
sed -i '/^Match User user[0-9]*/!b;n;c\ PasswordAuthentication yes' /etc/ssh/sshd_config
|
sed -i '/^Match User [a-zA-Z0-9_]*/!b;n;c\ PasswordAuthentication yes' /etc/ssh/sshd_config
|
||||||
else
|
else
|
||||||
echo -e "\n# Added by SFTP addon\nMatch User user*\n\tPasswordAuthentication yes" >> /etc/ssh/sshd_config
|
echo -e "\n# Added by SFTP addon\nMatch User *\n\tPasswordAuthentication yes" >> /etc/ssh/sshd_config
|
||||||
fi
|
fi
|
||||||
awk '!seen[$0]++' /etc/ssh/sshd_config > /etc/ssh/sshd_config.tmp && mv /etc/ssh/sshd_config.tmp /etc/ssh/sshd_config
|
awk '!seen[$0]++' /etc/ssh/sshd_config > /etc/ssh/sshd_config.tmp && mv /etc/ssh/sshd_config.tmp /etc/ssh/sshd_config
|
||||||
systemctl restart sshd
|
systemctl restart sshd
|
||||||
|
@ -111,9 +116,12 @@ menu:
|
||||||
|
|
||||||
actions:
|
actions:
|
||||||
add_sftp_user:
|
add_sftp_user:
|
||||||
|
- setGlobals:
|
||||||
|
enable_ssh: ${settings.sfpform.enable_ssh:false}
|
||||||
- cmd[cp]:
|
- cmd[cp]:
|
||||||
user: root
|
user: root
|
||||||
commands: bash /home/jelastic/add-sftp-user-addon/add-sftp.sh "${globals.username}" "${globals.password}" "${settings.sfpform.enable_ssh}"
|
commands: |-
|
||||||
|
bash /home/jelastic/add-sftp-user-addon/add-sftp.sh "${globals.username}" "${globals.password}" "${globals.enable_ssh}"
|
||||||
- cmd[cp]:
|
- cmd[cp]:
|
||||||
user: root
|
user: root
|
||||||
commands: echo $CREATED_USERNAME
|
commands: echo $CREATED_USERNAME
|
||||||
|
|
Loading…
Reference in New Issue