]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/initscripts/helper/aws-setup
aws-setup: Remove some excessive whitespace
[people/pmueller/ipfire-2.x.git] / src / initscripts / helper / aws-setup
index 0ae727c3ff8ea7217cee72e1026979dd4fd37035..2c3311fc24ba44e0b44fddc3484a4100d25a99c5 100644 (file)
@@ -3,10 +3,13 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+# Set PATH to find our own executables
+export PATH=/usr/local/sbin:/usr/local/bin:${PATH}
+
 get() {
        local file="${1}"
 
-       wget -qO - "http://169.254.169.254/latest/meta-data/${file}"
+       wget -qO - "http://169.254.169.254/latest/${file}"
 }
 
 to_address() {
@@ -47,24 +50,8 @@ prefix2netmask() {
        to_address "$(( netmask ^ 0xffffffff ))"
 }
 
-find_interface() {
-       local mac="${1}"
-
-       local path
-       for path in /sys/class/net/*; do
-               local address="$(<${path}/address)"
-
-               if [ "${mac}" = "${address}" ]; then
-                       basename "${path}"
-                       return 0
-               fi
-       done
-
-       return 1
-}
-
 import_aws_configuration() {
-       local instance_id="$(get instance-id)"
+       local instance_id="$(get meta-data/instance-id)"
 
        boot_mesg "Importing AWS configuration for instance ${instance_id}..."
 
@@ -72,7 +59,7 @@ import_aws_configuration() {
        echo "${instance_id}" > /var/run/aws-instance-id
 
        # Initialise system settings
-       local hostname=$(get local-hostname)
+       local hostname=$(get meta-data/local-hostname)
 
        # Set hostname
        if ! grep -q "^HOSTNAME=" /var/ipfire/main/settings; then
@@ -86,29 +73,47 @@ import_aws_configuration() {
 
        # Create setup user
        if ! getent passwd setup &>/dev/null; then
-               useradd -r setup -s /usr/bin/run-setup -g nobody -m
+               useradd setup -s /usr/bin/run-setup -g nobody -m
+
+               # Unlock the account
+               usermod -p "x" setup
        fi
 
-       # Import SSH keys
-       local user
-       for user in /root /home/setup; do
-               local line
-               for line in $(get "public-keys/"); do
-                       local key_no="${line%=*}"
-
-                       local key="$(get public-keys/${key_no}/openssh-key)"
-                       if [ -n "${key}" ] && ! grep -q "^${key}$" "${user}/.ssh/authorized_keys" 2>/dev/null; then
-                               mkdir -p "${user}/.ssh"
-                               chmod 700 "${user}/.ssh"
-
-                               echo "${key}" >> "${user}/.ssh/authorized_keys"
-                               chmod 600 "${user}/.ssh/authorized_keys"
-                       fi
-               done
+       # Import SSH keys for setup user
+       local line
+       for line in $(get "meta-data/public-keys/"); do
+               local key_no="${line%=*}"
+
+               local key="$(get meta-data/public-keys/${key_no}/openssh-key)"
+               if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then
+                       mkdir -p "/home/setup/.ssh"
+                       chmod 700 "/home/setup/.ssh"
+                       chown setup.nobody "/home/setup/.ssh"
+
+                       echo "${key}" >> "/home/setup/.ssh/authorized_keys"
+                       chmod 600 "/home/setup/.ssh/authorized_keys"
+                       chown setup.nobody "/home/setup/.ssh/authorized_keys"
+               fi
        done
 
-       # Import any DNS server settings
-       eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
+       # Download the user-data script only on the first boot
+       if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
+               # Download user-data
+               local user_data="$(get user-data)"
+
+               # Save user-data script to be executed later
+               if [ "${user_data:0:2}" = "#!" ]; then
+                       echo "${user_data}" > /tmp/aws-user-data.script
+                       chmod 700 /tmp/aws-user-data.script
+
+                       # Run the user-data script
+                       local now="$(date -u +"%s")"
+                       /tmp/aws-user-data.script &>/var/log/user-data.log.${now}
+
+                       # Delete the script right away
+                       rm /tmp/aws-user-data.script
+               fi
+       fi
 
        # Import network configuration
        # After this, no network connectivity will be available from this script due to the
@@ -117,24 +122,24 @@ import_aws_configuration() {
        : > /var/ipfire/ethernet/settings
 
        local mac
-       for mac in $(get network/interfaces/macs/); do
+       for mac in $(get meta-data/network/interfaces/macs/); do
                # Remove trailing slash
                mac="${mac//\//}"
 
-               local device_number="$(get "network/interfaces/macs/${mac}/device-number")"
-               local interface_id="$(get "network/interfaces/macs/${mac}/interface-id")"
+               local device_number="$(get "meta-data/network/interfaces/macs/${mac}/device-number")"
+               local interface_id="$(get "meta-data/network/interfaces/macs/${mac}/interface-id")"
 
                # First IPv4 address
-               local ipv4_address="$(get "network/interfaces/macs/${mac}/local-ipv4s" | head -n1)"
+               local ipv4_address="$(get "meta-data/network/interfaces/macs/${mac}/local-ipv4s" | head -n1)"
                local ipv4_address_num="$(to_integer "${ipv4_address}")"
 
                # Get VPC subnet
-               local vpc="$(get "network/interfaces/macs/${mac}/vpc-ipv4-cidr-block")"
+               local vpc="$(get "meta-data/network/interfaces/macs/${mac}/vpc-ipv4-cidr-block")"
                local vpc_netaddress="${vpc%/*}"
                local vpc_netaddress_num="$(to_integer "${vpc_netaddress}")"
 
                # Get subnet size
-               local subnet="$(get "network/interfaces/macs/${mac}/subnet-ipv4-cidr-block")"
+               local subnet="$(get "meta-data/network/interfaces/macs/${mac}/subnet-ipv4-cidr-block")"
 
                local prefix="${subnet#*/}"
                local netmask="$(prefix2netmask "${prefix}")"
@@ -153,10 +158,6 @@ import_aws_configuration() {
                                # The gateway is always the first IP address in the subnet
                                local gateway="$(to_address $(( netaddress_num + 1 )))"
 
-                               # The AWS internal DNS service is available on the second IP address of the VPC
-                               local dns1="$(to_address $(( vpc_netaddress_num + 2 )))"
-                               local dns2=
-
                                (
                                        echo "RED_TYPE=STATIC"
                                        echo "RED_DEV=${interface_name}"
@@ -167,12 +168,10 @@ import_aws_configuration() {
                                        echo "RED_NETADDRESS=${netaddress}"
                                        echo "RED_BROADCAST=${broadcast}"
                                        echo "DEFAULT_GATEWAY=${gateway}"
-                                       echo "DNS1=${DNS1:-${dns1}}"
-                                       echo "DNS2=${DNS2:-${dns2}}"
                                ) >> /var/ipfire/ethernet/settings
 
                                # Import aliases for RED
-                               for alias in $(get "network/interfaces/macs/${mac}/local-ipv4s" | tail -n +2); do
+                               for alias in $(get "meta-data/network/interfaces/macs/${mac}/local-ipv4s" | tail -n +2); do
                                        echo "${alias},on,"
                                done > /var/ipfire/ethernet/aliases
                                ;;
@@ -208,14 +207,6 @@ import_aws_configuration() {
                                ) >> /var/ipfire/ethernet/settings
                                ;;
                esac
-
-               # Rename interface
-               local interface="$(find_interface "${mac}")"
-
-               if [ -n "${interface}" ] && [ -n "${interface_name}" ] && [ "${interface}" != "${interface_name}" ]; then
-                       ip link set "${interface}" down
-                       ip link set "${interface}" name "${interface_name}"
-               fi
        done
 
        # Save CONFIG_TYPE
@@ -226,8 +217,8 @@ import_aws_configuration() {
                # Enable SSH
                sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings
 
-               touch /var/ipfire/remote/enablessh
-               chown nobody:nobody /var/ipfire/remote/enablessh
+               # Disable SSH password authentication
+               sed -e "s/^ENABLE_SSH_PASSWORDS=.*/ENABLE_SSH_PASSWORDS=off/" -i /var/ipfire/remote/settings
 
                # Enable SSH key authentication
                sed -e "s/^ENABLE_SSH_KEYS=.*/ENABLE_SSH_KEYS=on/" -i /var/ipfire/remote/settings
@@ -235,6 +226,10 @@ import_aws_configuration() {
                # Apply SSH settings
                /usr/local/bin/sshctrl
 
+               # Mark SSH to start immediately (but not right now)
+               touch /var/ipfire/remote/enablessh
+               chown nobody:nobody /var/ipfire/remote/enablessh
+
                # Firewall rules for SSH and WEBIF
                (
                        echo "1,ACCEPT,INPUTFW,ON,std_net_src,ALL,ipfire,RED1,,TCP,,,ON,,,cust_srv,SSH,,,,,,,,,,,00:00,00:00,,AUTO,,dnat,,,,,second"
@@ -265,13 +260,27 @@ case "${reason}" in
                # Add the default route
                ip route add default via "${new_routers}"
 
+               # Setup DNS
+               for domain_name_server in ${new_domain_name_servers}; do
+                       echo "nameserver ${domain_name_server}"
+               done > /etc/resolv.conf
+
+               # The system is online now
+               touch /var/ipfire/red/active
+
                # Import AWS configuration
                import_aws_configuration
                ;;
 
        EXPIRE|FAIL|RELEASE|STOP)
+               # The system is no longer online
+               rm -f /var/ipfire/red/active
+
                # Remove all IP addresses
                ip addr flush dev "${interface}"
+
+               # Shut down the interface
+               ip link set "${interface}" down
                ;;
 
        *)