Raspi2-3_GenImage Commit - r123:f35e7443794e · Collaboration Tremplin des Sciences

Fixed: Use authorized_keys file instead of authorized_keys2

drtyhlpr -

r123:f35e7443794e

parent child

Context file:

r123:f35e7443794e

Collapse all files

README.md +4 -4

             Limit the users that are allowed to login via SSH. Only allow user `USER_NAME`=pi and root if `SSH_ENABLE_ROOT`=true to login.
             ##### `SSH_ROOT_AUTHORIZED_KEYS`=""
-            Add specified SSH `authorized_keys2` file that contains keys for public key based SSH (v2) authentication of user `root`. SSH protocol version 1 is not supported. `ENABLE_ROOT` **and** `SSH_ENABLE_ROOT` must be set to `true`.
+            Add specified SSH `authorized_keys` file that contains keys for public key based SSH (v2) authentication of user `root`. SSH protocol version 1 is not supported. `ENABLE_ROOT` **and** `SSH_ENABLE_ROOT` must be set to `true`.
             ##### `SSH_ROOT_PUB_KEY`=""
-            Add specified SSH (v2) public key file to `authorized_keys2` file to enable public key based SSH (v2) authentication of user `root`. SSH protocol version 1 is not supported. `ENABLE_ROOT` **and** `SSH_ENABLE_ROOT` must be set to `true`.
+            Add specified SSH (v2) public key file to `authorized_keys` file to enable public key based SSH (v2) authentication of user `root`. SSH protocol version 1 is not supported. `ENABLE_ROOT` **and** `SSH_ENABLE_ROOT` must be set to `true`.
             ##### `SSH_USER_AUTHORIZED_KEYS`=""
-            Add specified SSH `authorized_keys2` file that contains keys for public key based SSH (v2) authentication of user `USER_NAME`=pi. SSH protocol version 1 is not supported.
+            Add specified SSH `authorized_keys` file that contains keys for public key based SSH (v2) authentication of user `USER_NAME`=pi. SSH protocol version 1 is not supported.
             ##### `SSH_USER_PUB_KEY`=""
-            Add specified SSH (v2) public key file to `authorized_keys2` file to enable public key based SSH (v2) authentication of user `USER_NAME`=pi. SSH protocol version 1 is not supported.
+            Add specified SSH (v2) public key file to `authorized_keys` file to enable public key based SSH (v2) authentication of user `USER_NAME`=pi. SSH protocol version 1 is not supported.
             #### Kernel compilation:
             ##### `BUILD_KERNEL`=false

bootstrap.d/32-sshd.sh +10 -10

                 # Install SSH (v2) authorized keys file for user root
                 if [ ! -z "$SSH_ROOT_AUTHORIZED_KEYS" ] ; then
-                  install_readonly "$SSH_ROOT_AUTHORIZED_KEYS" "${R}/root/.ssh/authorized_keys2"
+                  install_readonly "$SSH_ROOT_AUTHORIZED_KEYS" "${R}/root/.ssh/authorized_keys"
                 fi
                 # Add SSH (v2) public key for user root
                 if [ ! -z "$SSH_ROOT_PUB_KEY" ] ; then
-                  cat "$SSH_ROOT_PUB_KEY" >> "${R}/root/.ssh/authorized_keys2"
+                  cat "$SSH_ROOT_PUB_KEY" >> "${R}/root/.ssh/authorized_keys"
                 fi
                 # Set permissions of root SSH authorized keys file
-                if [ -f "${R}/root/.ssh/authorized_keys2" ] ; then
+                if [ -f "${R}/root/.ssh/authorized_keys" ] ; then
-                  chroot_exec chmod 600 "/root/.ssh/authorized_keys2"
+                  chroot_exec chmod 600 "/root/.ssh/authorized_keys"
-                  chroot_exec chown root:root "/root/.ssh/authorized_keys2"
+                  chroot_exec chown root:root "/root/.ssh/authorized_keys"
                   # Allow SSH public key authentication
                   sed -i "s|[#]*PubkeyAuthentication.*|PubkeyAuthentication yes|g" "${ETC_DIR}/ssh/sshd_config"
                 # Install SSH (v2) authorized keys file for user $USER_NAME
                 if [ ! -z "$SSH_USER_AUTHORIZED_KEYS" ] ; then
-                  install_readonly "$SSH_USER_AUTHORIZED_KEYS" "${R}/home/${USER_NAME}/.ssh/authorized_keys2"
+                  install_readonly "$SSH_USER_AUTHORIZED_KEYS" "${R}/home/${USER_NAME}/.ssh/authorized_keys"
                 fi
                 # Add SSH (v2) public key for user $USER_NAME
                 if [ ! -z "$SSH_USER_PUB_KEY" ] ; then
-                  cat "$SSH_USER_PUB_KEY" >> "${R}/home/${USER_NAME}/.ssh/authorized_keys2"
+                  cat "$SSH_USER_PUB_KEY" >> "${R}/home/${USER_NAME}/.ssh/authorized_keys"
                 fi
                 # Set permissions of $USER_NAME SSH authorized keys file
-                if [ -f  "${R}/home/${USER_NAME}/.ssh/authorized_keys2" ] ; then
+                if [ -f  "${R}/home/${USER_NAME}/.ssh/authorized_keys" ] ; then
-                  chroot_exec chmod 600 "/home/${USER_NAME}/.ssh/authorized_keys2"
+                  chroot_exec chmod 600 "/home/${USER_NAME}/.ssh/authorized_keys"
-                  chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh/authorized_keys2"
+                  chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh/authorized_keys"
                   # Allow SSH public key authentication
                   sed -i "s|[#]*PubkeyAuthentication.*|PubkeyAuthentication yes|g" "${ETC_DIR}/ssh/sshd_config"

rpi23-gen-image.sh +2 -2

               APT_INCLUDES="${APT_INCLUDES},device-tree-compiler"
             fi
-            # Check if root SSH (v2) authorized keys file exists
+            # Check if root SSH authorized keys file exists
             if [ ! -z "$SSH_ROOT_AUTHORIZED_KEYS" ] ; then
               if [ ! -f "$SSH_ROOT_AUTHORIZED_KEYS" ] ; then
                 echo "error: '$SSH_ROOT_AUTHORIZED_KEYS' specified SSH authorized keys file not found (SSH_ROOT_AUTHORIZED_KEYS)!"
               fi
             fi
-            # Check if $USER_NAME SSH (v2) authorized keys file exists
+            # Check if $USER_NAME SSH authorized keys file exists
             if [ ! -z "$SSH_USER_AUTHORIZED_KEYS" ] ; then
               if [ ! -f "$SSH_USER_AUTHORIZED_KEYS" ] ; then
                 echo "error: '$SSH_USER_AUTHORIZED_KEYS' specified SSH authorized keys file not found (SSH_USER_AUTHORIZED_KEYS)!"

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages