Major changes

Author: x-sajalshres

Vagrantfile

@@ -87,9 +87,36 @@ end
 
 # Setup ssh
 def setup_ssh(config, ssh_config)
-    config.ssh.insert_key = false
-    config.ssh.private_key_path = [ssh_config['key']['private-key'], "#{Dir.home}/.vagrant.d/insecure_private_key"]
-    config.vm.provision "file", source: ssh_config['key']['public-key'], destination: "~/.ssh/authorized_keys"
+    #config.ssh.insert_key = false
+    #config.ssh.private_key_path = [
+    #    "#{Dir.home}/.vagrant.d/insecure_private_key"
+    #]
+    config.vm.provision :shell, privileged: false do |provisioner|
+        ssh_private_key = File.read(ssh_config['key']['private-key'])
+        ssh_pub_key = File.readlines(ssh_config['key']['public-key']).first.strip
+        provisioner.inline = <<-SHELL
+            if grep -sq "#{ssh_pub_key}" /home/$USER/.ssh/authorized_keys; then
+                echo "SSH: keys already provisioned."
+            else
+                echo "SSH: starting key provisioning"
+                mkdir -p /home/$USER/.ssh/
+                touch /home/$USER/.ssh/known_hosts
+                touch /home/$USER/.ssh/authorized_keys
+                echo #{ssh_pub_key} >> /home/$USER/.ssh/authorized_keys
+                sudo bash -c "echo #{ssh_pub_key} >> /root/.ssh/authorized_keys"
+            fi
+
+            if [ #{ssh_config['key']['copy']} == "true" ]; then
+                echo "SSH: copy is set to true, copying key"
+                echo "#{ssh_private_key}" > /home/$USER/.ssh/id_rsa
+                echo #{ssh_pub_key} > /home/$USER/.ssh/id_rsa.pub
+                chmod 600 /home/$USER/.ssh/id_rsa
+                chmod 644 /home/$USER/.ssh/id_rsa.pub
+            fi
+            chown -R $USER:$USER /home/$USER
+            exit 0
+        SHELL
+    end
 end
 
 # Setup sync folder

config.yaml.example

@@ -1,101 +1,58 @@
 api_version: 2
 vm:
-  base_box: 'ubuntu/bionic64'
-  base_box_version: '20200507.0.0' # Use latest to use latest version
-  name: 'nvUbuntuDev01'
-  cpus: 2
-  memory: 4096
-  disk_size: '40GB'
+  base_box: 'sajalshres/ubuntu-dev-box'
+  base_box_version: '1.0.0' # Use latest to use latest version
+  name: 'ubuntubox'
+  cpus: 1
+  memory: 1024
+  disk_size: '12GB'
   providers:
     virtualbox:
-      gui: false
+      gui: true
   network:
     ports:
-      - host: 8000
-        guest: 8000
-      - host: 3000
-        guest: 3000
+      - host: 9999
+        guest: 9999
   ssh:
     key:
       # Generate ssh key: ssh-keygen -t rsa -b 4096 -C "[email protected]"
       # And place the private and public full path below
-      private-key: c:/users/sajalshres/.ssh/id_rsa
-      public-key: c:/users/sajalshres/.ssh/id_rsa.pub
-    user:
-      username: developer
-      uid: 9090
-      gid: 9090
+      private-key: c:/users/<your-username>/.ssh/id_rsa
+      public-key: c:/users/<your-username>/.ssh/id_rsa.pub
+      # Set copy to true if you want to copy the local keys to box
+      # Otherwise, provision will generate new keys
+      copy: true
   sync-folder:
     enable: false
     type: synced_folder
-    source: d:/example
-    destination: /home/vagrant/example
+    source: d:/
+    destination: /d
 provisioners:
-  - base:
-      enable: true
-      before: :all
-      type: shell
-      path: provision/base.sh
-      privileged: true
-  - python:
-      enable: true
-      type: shell
-      path: provision/python.sh
-      privileged: true
-  - docker:
-      enable: true
-      type: shell
-      path: provision/docker.sh
-      privileged: true
-  # TODO: Check for following npm error:
-  ## Command: npm install -g eslint
-  ## Error: 429 Too Many Requests - GET https://registry.npmjs.org/strip-ansi
-  - web-development:
-      enable: true
-      type: shell
-      path: provision/web-development.sh
-      privileged: true
-  - desktop:
-      enable: true
-      type: shell
-      path: provision/desktop.sh
-      privileged: true
-  # TODO: Not proud of this implementation, change later.
-  - user:
-      enable: true
-      type: shell
-      path: provision/user.sh
-      privileged: true
-      arguments:
-        - value: user=developer
-        - value: uid=9090
-        - value: gid=9090
   - git:
-      enable: false
+      # This step will check if ssh keys exists from previous step,
+      # It will generate new keys and add it to github
+      # Make sure the key title doesnot exist in github
+      enable: enable
       type: shell
       path: provision/git.sh
       privileged: false
       arguments:
         # Github user name
-        - value: username=YOUR-GIT-USERNAME
+        - value: username=<your-username>
         # Github email
-        - value: email=YOUR-GIT-EMAIL
+        - value: email=<[email protected]>
         # Personal access api token
         # Personal access token can be used in place of password
         # More info: https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
         # Get your token: https://github.com/settings/tokens
-        - value: token=YOUR-TOKEN-ID
+        - value: token=<your-token>
+        # Key title must be unique, and should not exist already in github keys
+        - value: title=<your-ssh-key-title>
   - repositories:
-      enable: false
+      enable: enable
       type: shell
       path: provision/repositories.sh
       privileged: false
       arguments:
         # Your git repositories
         - value: [email protected]:sajalshres/linux-dev-box.git
-  - clean-up:
-      enable: true
-      after: :all
-      type: shell
-      path: provision/clean-up.sh
-      privileged: true

provision/desktop.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
-set -ex
+set +ex
 
-echo "$@"
 for ARGUMENT in "$@"
 do
-    echo "Argument is ${ARGUMENT}"
     KEY=$(echo $ARGUMENT | cut -f1 -d=)
     VALUE=$(echo $ARGUMENT | cut -f2 -d=)
 
@@ -21,6 +19,10 @@ do
             # Setup token varibale
             TOKEN=$VALUE
             ;;
+        title)
+            # Setup token varibale
+            TITLE=$VALUE
+            ;;
         *)
             echo "Invalid argument ${KEY}"
             ;;
@@ -31,6 +33,8 @@ done
 PRIVATE_KEY_FILE="${HOME}/.ssh/id_rsa"
 PUBLIC_KEY_FILE="${HOME}/.ssh/id_rsa.pub"
 
+
+
 function github-authenticated() {
   # Attempt to ssh to GitHub
   ssh -T [email protected] &>/dev/null
@@ -42,7 +46,7 @@ function github-authenticated() {
     # user is not authenticated
     return 1
   else
-    echo "unknown exit code in attempt to ssh into [email protected]"
+    echo "unknown exit code $RET in attempt to ssh into [email protected]"
   fi
   return 2
 }
@@ -54,32 +58,46 @@ function generate-ssh-keys() {
     # Add the ssh key to ssh-agent
     # ssh-add ~/.ssh/id_rsa
 
-    # Add GitHub to known host
-    ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-
     # Get the content of public key
     PUBLIC_KEY=`cat ~/.ssh/id_rsa.pub`
 
-    curl -s  -u "$USER_NAME:$TOKEN" -X POST -d "{\"title\":\"`hostname`\",\"key\":\"$PUBLIC_KEY\"}" \
+    curl -s  -u "$USER_NAME:$TOKEN" -X POST -d "{\"title\":\"$TITLE\",\"key\":\"$PUBLIC_KEY\"}" \
         https://api.github.com/user/keys > /dev/null
 }
 
+echo "GIT: Checking if github.com is a known hosts"
+ssh-keygen -H -F github.com
+RET=$?
+if [ $RET == 1 ]; then
+    # Add GitHub to known host
+    ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+else
+    echo "GIT: github.com is already a known host"
+fi
+
+
 if [ ! -f "${PRIVATE_KEY_FILE}" ] && [ ! -f "${PUBLIC_KEY_FILE}" ]; then
     # SSH key pair doesnot exists
+    echo "GIT: ${PRIVATE_KEY_FILE} and ${PUBLIC_KEY_FILE} does not exists"
+    echo "GIT: Generating new ssh key pair"
     generate-ssh-keys
 else
     # SSH Key pair exists
     # Check if the key works
+    echo "GIT: ${PRIVATE_KEY_FILE} and ${PUBLIC_KEY_FILE} already exists"
+    echo "GIT: Checking is github can be authenticated"
     if ! github-authenticated; then
         # Existing key is not working, generate again.
+        echo "GIT: Couldn't authenticate with existing, generating new one"
         generate-ssh-keys
     fi
 fi
 
 # Check if ssh key pair works
 if github-authenticated; then
-    echo "SSH key pair generated and validated successfully"
+    echo "GIT: SSH key pair setup successfully"
+    exit 0
 else
-    echo "Some problem in SSH key pair generation, please check logs"
+    echo "GIT: Some problem in SSH key pair generation, please check logs"
     exit 1
 fi

provision/docker.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ex
+set +ex
 
 LOCATION="${HOME}/Git"
 REPOSITORIES=("$@")
@@ -15,7 +15,7 @@ function github-authenticated() {
     # user is not authenticated
     return 1
   else
-    echo "unknown exit code in attempt to ssh into [email protected]"
+    echo "REPOSITORY: unknown exit code in attempt to ssh into [email protected]"
   fi
   return 2
 }
@@ -28,16 +28,21 @@ if [ ! -d $LOCATION ]; then
 fi
 
 # check if git is authenticated.
+echo "REPOSITORY: Checking GitHub access..."
 if github-authenticated; then
+    echo "REPOSITORY: GitHub access successful"
     for repository in "${REPOSITORIES[@]}"
     do
+        echo "REPOSITORY: Cloning $repository"
         repo_name=`basename "${repository%.*}"`
         repo_location="${LOCATION}/${repo_name}"
         if [ ! -d $repo_location ]; then
           cd $LOCATION
           git clone $repository
         else
-          echo "Repo ${repo_name} already exist's in ${LOCATION}"
+          echo "REPOSITORY: Repo ${repo_name} already exist's in ${LOCATION}, skipping..."
         fi
     done
+else
+ echo "REPOSITORY: Couldn't authenticate with Github, Please check your keys manually."
 fi