From 9f91b5511e80e0594636a078e028dcb884d25001 Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Sun, 2 Oct 2022 19:24:45 +0530
Subject: [PATCH 01/16] Update index.jsp
---
webapp/src/main/webapp/index.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index c833a72aec..b5fd23f023 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,3 +1,3 @@
Hello, Welcome to Simple DevOps Project !!
Deploying on a kubernetes using ansible for Valaxy Technologies
- Glad to see you here
+ devops is very interesting course
From 670b51c3c87fa70f2d176b50ac2121c1a15abf7a Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Sun, 2 Oct 2022 19:48:04 +0530
Subject: [PATCH 02/16] i have updateed one line
---
webapp/src/main/webapp/index.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index b5fd23f023..d9c1a53725 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,3 +1,3 @@
Hello, Welcome to Simple DevOps Project !!
Deploying on a kubernetes using ansible for Valaxy Technologies
- devops is very interesting course
+ devops is very interesting course and simple
From f9b6ae9f4c9af6594bff5c8a77568f74ee2b488a Mon Sep 17 00:00:00 2001
From: sagar
Date: Tue, 4 Apr 2023 00:06:12 -0700
Subject: [PATCH 03/16] fdfd
---
file1 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 file1
diff --git a/file1 b/file1
new file mode 100644
index 0000000000..e69de29bb2
From 82ee498521aedaa1e8938c16efe1d1faf7fa5160 Mon Sep 17 00:00:00 2001
From: sagar
Date: Tue, 4 Apr 2023 02:34:18 -0700
Subject: [PATCH 04/16] playbook commit
---
Playbook.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 Playbook.yml
diff --git a/Playbook.yml b/Playbook.yml
new file mode 100644
index 0000000000..520b5df925
--- /dev/null
+++ b/Playbook.yml
@@ -0,0 +1,18 @@
+---
+- hosts: test-servers
+ remote_user: sagar
+ become: true
+ vars:
+ project_root: /var/www/html
+ tasks:
+ - name: Install Apache Webserver
+ yum: pkg=httpd state=latest
+ - name: Place the index file at project root
+ copy: src=index.html dest={{ project_root }}/index.html owner=apache group=apache mode=0644
+ - name: Enable Apache on system reboot
+ service: name=httpd enabled=yes
+ notify: restart apache
+ handlers:
+ - name: restart apache
+ service: name=httpd state=restarted
+
From 020fc2409bf247a569cc7cb83f4edd45ad5767ac Mon Sep 17 00:00:00 2001
From: sagar
Date: Tue, 4 Apr 2023 02:44:11 -0700
Subject: [PATCH 05/16] docker file
---
Dockerfile2 | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 Dockerfile2
diff --git a/Dockerfile2 b/Dockerfile2
new file mode 100644
index 0000000000..2c085a9ce1
--- /dev/null
+++ b/Dockerfile2
@@ -0,0 +1,7 @@
+FROM ubuntu
+RUN apt update
+RUN apt install –y apache2
+RUN apt install –y apache2-utils
+RUN apt clean
+EXPOSE 80
+CMD [“apache2ctl”, “-D”, “FOREGROUND”]
From ac3939e864f4c323f545f55a609e308e17fb9816 Mon Sep 17 00:00:00 2001
From: sagar
Date: Tue, 4 Apr 2023 02:47:44 -0700
Subject: [PATCH 06/16] Revert "playbook commit"
This reverts commit 82ee498521aedaa1e8938c16efe1d1faf7fa5160.
---
Playbook.yml | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 Playbook.yml
diff --git a/Playbook.yml b/Playbook.yml
deleted file mode 100644
index 520b5df925..0000000000
--- a/Playbook.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: test-servers
- remote_user: sagar
- become: true
- vars:
- project_root: /var/www/html
- tasks:
- - name: Install Apache Webserver
- yum: pkg=httpd state=latest
- - name: Place the index file at project root
- copy: src=index.html dest={{ project_root }}/index.html owner=apache group=apache mode=0644
- - name: Enable Apache on system reboot
- service: name=httpd enabled=yes
- notify: restart apache
- handlers:
- - name: restart apache
- service: name=httpd state=restarted
-
From 6799ebc1e2ae2fdb6e1cbc8c57a74985a05acbf5 Mon Sep 17 00:00:00 2001
From: sagar
Date: Tue, 4 Apr 2023 05:30:01 -0700
Subject: [PATCH 07/16] demo file
---
abc | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 abc
diff --git a/abc b/abc
new file mode 100644
index 0000000000..91b5c84e80
--- /dev/null
+++ b/abc
@@ -0,0 +1,2 @@
+fineshift
+
From aca2543c1409adb48370eccd04f1a5e6d0a19c63 Mon Sep 17 00:00:00 2001
From: sagar
Date: Tue, 4 Apr 2023 05:40:14 -0700
Subject: [PATCH 08/16] new file
---
123 | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 123
diff --git a/123 b/123
new file mode 100644
index 0000000000..9bb7acd5a7
--- /dev/null
+++ b/123
@@ -0,0 +1,2 @@
+ welcome to fineshift
+
From 430061920bef1be6281040700fdb3a7dad147e83 Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Tue, 4 Apr 2023 05:47:15 -0700
Subject: [PATCH 09/16] Create sagar
---
sagar | 1 +
1 file changed, 1 insertion(+)
create mode 100644 sagar
diff --git a/sagar b/sagar
new file mode 100644
index 0000000000..ce01362503
--- /dev/null
+++ b/sagar
@@ -0,0 +1 @@
+hello
From 31c8b65e8bc1b5f108acb211e6cac9d49dd62e66 Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:05:33 +0530
Subject: [PATCH 10/16] Delete sagar
---
sagar | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 sagar
diff --git a/sagar b/sagar
deleted file mode 100644
index ce01362503..0000000000
--- a/sagar
+++ /dev/null
@@ -1 +0,0 @@
-hello
From 66a9819c4660bba891397a515b21f5c2e9f24fe9 Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:05:45 +0530
Subject: [PATCH 11/16] Delete file1
---
file1 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 file1
diff --git a/file1 b/file1
deleted file mode 100644
index e69de29bb2..0000000000
From 16f617785b757f9220861e1286b13f163dce8271 Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:05:57 +0530
Subject: [PATCH 12/16] Delete 123
---
123 | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 123
diff --git a/123 b/123
deleted file mode 100644
index 9bb7acd5a7..0000000000
--- a/123
+++ /dev/null
@@ -1,2 +0,0 @@
- welcome to fineshift
-
From 5ce8de25c6ae8093dd756e095952999837f288cc Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:06:21 +0530
Subject: [PATCH 13/16] Delete Dockerfile2
---
Dockerfile2 | 7 -------
1 file changed, 7 deletions(-)
delete mode 100644 Dockerfile2
diff --git a/Dockerfile2 b/Dockerfile2
deleted file mode 100644
index 2c085a9ce1..0000000000
--- a/Dockerfile2
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ubuntu
-RUN apt update
-RUN apt install –y apache2
-RUN apt install –y apache2-utils
-RUN apt clean
-EXPOSE 80
-CMD [“apache2ctl”, “-D”, “FOREGROUND”]
From e91d0949bd52a39275d10352a69372e683addad2 Mon Sep 17 00:00:00 2001
From: sagarbarawakar711 <114502514+sagarbarawakar711@users.noreply.github.com>
Date: Mon, 17 Apr 2023 18:06:30 +0530
Subject: [PATCH 14/16] Delete abc
---
abc | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 abc
diff --git a/abc b/abc
deleted file mode 100644
index 91b5c84e80..0000000000
--- a/abc
+++ /dev/null
@@ -1,2 +0,0 @@
-fineshift
-
From 11c19506d774a03d6a40171a305a259e5ccc9e0c Mon Sep 17 00:00:00 2001
From: sagar
Date: Wed, 7 Aug 2024 15:52:10 +0000
Subject: [PATCH 15/16] modified docker file
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 171c9407fb..bbf448ad1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,6 @@
From tomcat:8-jre8
# Maintainer
-MAINTAINER "valaxytech@gmail.com"
+MAINTAINER "sagarbarawakar@gmail.com"
COPY ./webapp.war /usr/local/tomcat/webapps
From 6bb4533bec8c443f4d11289b77f19f8cc95266e3 Mon Sep 17 00:00:00 2001
From: sagar
Date: Wed, 7 Aug 2024 16:56:53 +0000
Subject: [PATCH 16/16] sagar branch
---
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index bbf448ad1b..9f6b8c598a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@
From tomcat:8-jre8
# Maintainer
-MAINTAINER "sagarbarawakar@gmail.com"
+MAINTAINER "sagarbarawakar@gmail.com"
+RUN mkdir -p /opt/sms
COPY ./webapp.war /usr/local/tomcat/webapps