From 8009e9030364249318b741caf65d335015d947ad Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 <132168565+Pinkysahoo43@users.noreply.github.com> Date: Wed, 3 May 2023 00:12:56 +0530 Subject: [PATCH 01/12] Update README.md --- 2-Git/README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/2-Git/README.md b/2-Git/README.md index 3e9dad2..66f9262 100644 --- a/2-Git/README.md +++ b/2-Git/README.md @@ -1,4 +1,14 @@ -# Version Control System +# Version Control SystemTable of Contents + +Table of Contents + +1. [Purpose of Git Branches](#purpose-of-git-branches) +2. [Creating a Branch](#creating-a-branch) +3. [Switching Between Branches](#switching-between-branches) +4. [Merging Branches](#merging-branches) +5. [Deleting a Branch](#deleting-a-branch) + + ## Introduction From a52f6407736e18105e6d4c5b94d89f802763836e Mon Sep 17 00:00:00 2001 From: pinkysahoo43 Date: Thu, 4 May 2023 19:41:11 +0000 Subject: [PATCH 02/12] changes in index file --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 4ba7365..d48160c 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ -XYZ-company/title> +<title>ABC-company/ From bab7a2ade2e44362a9d7f8a03343c8325980d74f Mon Sep 17 00:00:00 2001 From: pinkysahoo43 Date: Thu, 4 May 2023 19:55:43 +0000 Subject: [PATCH 03/12] changes in heading --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index d48160c..90cd69a 100644 --- a/index.html +++ b/index.html @@ -14,6 +14,8 @@

This is GitOps Class going on.

+

Hello To All

+

This is a paragraph in Dev Branch.

we are learning about git Merge

From 82fa7a9b14bed4a9ddaaa2a8d9e821b4a2219d79 Mon Sep 17 00:00:00 2001 From: pinkysahoo43 Date: Thu, 4 May 2023 20:13:57 +0000 Subject: [PATCH 04/12] adding paragraph --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 90cd69a..f87e67c 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@

Hello To All

we are learning about git Merge

- +

Merging

From c7afb3be0291cefe444bfeadbd9524d11099f05a Mon Sep 17 00:00:00 2001 From: pinkysahoo43 Date: Mon, 8 May 2023 14:08:58 +0000 Subject: [PATCH 05/12] changes to trigger Jenkin --- 5-jenkins/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5-jenkins/README.md b/5-jenkins/README.md index 8e3b6ad..4097a9a 100644 --- a/5-jenkins/README.md +++ b/5-jenkins/README.md @@ -1,4 +1,4 @@ -# DevOps-Tutorial for Jenkins 1 +# DevOps-Tutorial for Jenkins 5 DevOps-Tutorial # Caltech-DevOps Simplilearn PG Program From b3ca164128435f45b66a441333270b7093d80753 Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Mon, 8 May 2023 14:32:38 +0000 Subject: [PATCH 06/12] change in trigger --- 5-jenkins/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5-jenkins/README.md b/5-jenkins/README.md index 4097a9a..03e339b 100644 --- a/5-jenkins/README.md +++ b/5-jenkins/README.md @@ -1,4 +1,4 @@ -# DevOps-Tutorial for Jenkins 5 +# DevOps-Tutorial for Jenkins 5h DevOps-Tutorial # Caltech-DevOps Simplilearn PG Program From 97977ec279828a462924523e9c7d609fd0f68193 Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Mon, 8 May 2023 15:10:09 +0000 Subject: [PATCH 07/12] Trigger changes --- 5-jenkins/DevOps-Tutorial | 1 + 1 file changed, 1 insertion(+) create mode 160000 5-jenkins/DevOps-Tutorial diff --git a/5-jenkins/DevOps-Tutorial b/5-jenkins/DevOps-Tutorial new file mode 160000 index 0000000..1ad88c8 --- /dev/null +++ b/5-jenkins/DevOps-Tutorial @@ -0,0 +1 @@ +Subproject commit 1ad88c82f9d99622fb577e1969bbde678ec34011 From ce721ca9c6e28dcdbf28fd31930fef90d5b24d2c Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Mon, 8 May 2023 15:39:01 +0000 Subject: [PATCH 08/12] Triggers changing --- 5-jenkins/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5-jenkins/README.md b/5-jenkins/README.md index 03e339b..0f4e76d 100644 --- a/5-jenkins/README.md +++ b/5-jenkins/README.md @@ -1,4 +1,4 @@ -# DevOps-Tutorial for Jenkins 5h +# DevOps-Tutorial for Jenkins 6 DevOps-Tutorial # Caltech-DevOps Simplilearn PG Program From 790d9ed8148a0cd6e8f4f5f7d8496a6a06e57cca Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Mon, 8 May 2023 16:37:18 +0000 Subject: [PATCH 09/12] java Program --- 5-jenkins/5.2-simple-java-program/Helloworld.java | 6 ++++++ program/README.md | 0 2 files changed, 6 insertions(+) create mode 100644 5-jenkins/5.2-simple-java-program/Helloworld.java create mode 100644 program/README.md diff --git a/5-jenkins/5.2-simple-java-program/Helloworld.java b/5-jenkins/5.2-simple-java-program/Helloworld.java new file mode 100644 index 0000000..8513481 --- /dev/null +++ b/5-jenkins/5.2-simple-java-program/Helloworld.java @@ -0,0 +1,6 @@ +public class Helloworld { + public static void main(String[] args) { + System.out.println("Hello, World From Bhagyalakshmi"); + } +} + diff --git a/program/README.md b/program/README.md new file mode 100644 index 0000000..e69de29 From 73c8129231872d715b91d6feb06b66c60d913ada Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Thu, 11 May 2023 14:08:02 +0000 Subject: [PATCH 10/12] adding maven java program --- .../src/main/java/com/mycompany/app/App.java | 2 +- .../compile/default-compile/inputFiles.lst | 2 +- .../default-testCompile/inputFiles.lst | 2 +- .../TEST-com.mycompany.app.AppTest.xml | 20 +++++++++---------- .../com.mycompany.app.AppTest.txt | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java b/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java index 32e3060..1020e0e 100644 --- a/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java +++ b/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java @@ -8,6 +8,6 @@ public class App { public static void main( String[] args ) { - System.out.println( "Hello World! From Varun Manik in Simplilearn class" ); + System.out.println( "Hello World! From Bhagyalakshmi " ); } } diff --git a/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 384d5a8..d359cb6 100644 --- a/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1 +1 @@ -/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java +/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/main/java/com/mycompany/app/App.java diff --git a/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 9ff666c..4c50c4a 100644 --- a/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/5-jenkins/5.3-maven-project/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1 +1 @@ -/home/varunmanikoutlo/varun/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/test/java/com/mycompany/app/AppTest.java +/home/nicepinkysahoo4/DevOps-Tutorial/DevOps-Tutorial/DevOps-Tutorial/5-jenkins/5.3-maven-project/my-app/src/test/java/com/mycompany/app/AppTest.java diff --git a/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml b/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml index dac6ed8..86154b2 100644 --- a/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml +++ b/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml @@ -1,11 +1,11 @@ - + - + @@ -14,36 +14,36 @@ - + - + - + - + - + - + - + - + diff --git a/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt b/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt index efc88dd..2dd76de 100644 --- a/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt +++ b/5-jenkins/5.3-maven-project/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.mycompany.app.AppTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.042 s - in com.mycompany.app.AppTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 s - in com.mycompany.app.AppTest From 832f4a6386740adcec42c36e8153f1f4ccd7c890 Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Tue, 16 May 2023 13:31:23 +0000 Subject: [PATCH 11/12] ansible readme --- 6-ansible/6.7-S3-Bucket-Using-Terraform/main.tf | 2 +- 6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg | 2 +- 6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini | 4 ++-- 6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini | 4 ++++ 6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf | 3 +-- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini diff --git a/6-ansible/6.7-S3-Bucket-Using-Terraform/main.tf b/6-ansible/6.7-S3-Bucket-Using-Terraform/main.tf index 84b4269..314d7ee 100644 --- a/6-ansible/6.7-S3-Bucket-Using-Terraform/main.tf +++ b/6-ansible/6.7-S3-Bucket-Using-Terraform/main.tf @@ -3,7 +3,7 @@ provider "aws" { region = "us-east-1" } resource "aws_s3_bucket" "b" { - bucket = "my-tf-test-bucket-345611" + bucket = "my-tf1-test-bucket-34561120" acl = "private" tags = { diff --git a/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg b/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg index 3f2db16..87d21a4 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg +++ b/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -inventory = inventory.ini +inventory = inventory1.ini remote_user = ubuntu private_key_file = ../deployer host_key_checking = False diff --git a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini index 0489eaf..97a7d8b 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini +++ b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini @@ -6,7 +6,7 @@ ansible_user=ec2-user ansible_ssh_private_key_file=../deployer [aws_linux_vm] -wp-server ansible_host=3.81.25.108 +wp-server ansible_host=44.211.220.186 [ubuntu:children] ubuntu_vm @@ -16,4 +16,4 @@ ansible_user=ubuntu ansible_ssh_private_key_file=../deployer [ubuntu_vm] -my_server_1 ansible_host=44.210.103.164 +my_server_1 ansible_host=44.211.128.2 diff --git a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini new file mode 100644 index 0000000..c3e8346 --- /dev/null +++ b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini @@ -0,0 +1,4 @@ +[my_servers] +my_server_1 ansible_host="44.211.128.2 +my_server_2 ansible_host="54.175.8.33" +my_server_3 ansible_host="3.88.85.23" \ No newline at end of file diff --git a/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf b/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf index d070f9c..be270fc 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf +++ b/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf @@ -32,10 +32,9 @@ resource "aws_instance" "ubuntu" { ami = "ami-007855ac798b5175e" instance_type = "t3.micro" key_name = aws_key_pair.deployer.key_name - count = 3 vpc_security_group_ids = ["${aws_security_group.allow_SSH_ubuntu.id}"] tags = { - "Name" = "UBUNTU-${count.index}" + "Name" = "UBUNTU-16-05" "ENV" = "Dev" } From 30680a3fffd8aea671b8bb72467d260331de34a2 Mon Sep 17 00:00:00 2001 From: Pinkysahoo43 Date: Tue, 16 May 2023 16:31:23 +0000 Subject: [PATCH 12/12] docker commands --- 6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg | 2 +- 6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini | 2 +- 6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini | 6 +++--- 6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf | 3 ++- 6-ansible/wordpress/wp.yaml | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg b/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg index 87d21a4..3f2db16 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg +++ b/6-ansible/6.8-tf-ec2-provisioning/ansible/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -inventory = inventory1.ini +inventory = inventory.ini remote_user = ubuntu private_key_file = ../deployer host_key_checking = False diff --git a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini index 97a7d8b..6701a8e 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini +++ b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory.ini @@ -6,7 +6,7 @@ ansible_user=ec2-user ansible_ssh_private_key_file=../deployer [aws_linux_vm] -wp-server ansible_host=44.211.220.186 +wp-server ansible_host=18.209.168.230 [ubuntu:children] ubuntu_vm diff --git a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini index c3e8346..0956f62 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini +++ b/6-ansible/6.8-tf-ec2-provisioning/ansible/inventory1.ini @@ -1,4 +1,4 @@ [my_servers] -my_server_1 ansible_host="44.211.128.2 -my_server_2 ansible_host="54.175.8.33" -my_server_3 ansible_host="3.88.85.23" \ No newline at end of file +my_server_1 ansible_host="54.152.209.126" +my_server_2 ansible_host="44.212.28.99" +my_server_3 ansible_host="54.152.140.33" \ No newline at end of file diff --git a/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf b/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf index be270fc..cd5a4d2 100644 --- a/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf +++ b/6-ansible/6.8-tf-ec2-provisioning/ubuntu-vm.tf @@ -33,8 +33,9 @@ resource "aws_instance" "ubuntu" { instance_type = "t3.micro" key_name = aws_key_pair.deployer.key_name vpc_security_group_ids = ["${aws_security_group.allow_SSH_ubuntu.id}"] + count = 3 tags = { - "Name" = "UBUNTU-16-05" + "Name" = "UBUNTU-${count.index}" "ENV" = "Dev" } diff --git a/6-ansible/wordpress/wp.yaml b/6-ansible/wordpress/wp.yaml index bb297fe..6a9d126 100644 --- a/6-ansible/wordpress/wp.yaml +++ b/6-ansible/wordpress/wp.yaml @@ -5,7 +5,7 @@ db_name: wordpress db_user: wordpress db_password: secure-123 - db_host: 34.230.43.235 # added DB_HOST + db_host: 18.209.168.230 # added DB_HOST wp_table_prefix: wp_ # added wp_table_prefix