Fixed naming convention of websites

Signed-Off-By: Parth<[email protected]>
turington · Feb 25, 2020 · 707c631 · 707c631
1 parent 23f0567
commit 707c631
Show file tree

Hide file tree

Showing 46 changed files with 37 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -10,3 +10,13 @@
 
 
 
+
+
+### Rules:
+
+0. All URL will end with ".in"
+1. Name of a website can contain only alpha-numeric characters and hyphen '-'
+2. All URL will follow lowercase syntax (Google.in is wrong| google.in is right)
+3. replace '+' with 'plus' and append '-' in between for joining with other words, for example: for alt+F4 you have to specify URL 'alt-plus-F4'
+4. If your URL starts with a number then add character 'n' in front of it. eg: for '2020' the URL will be 'n2020'
+5. Should not container dot '.' or space ' '. Replace them with a hyphen '-'
diff --git a/deploy.sh b/deploy.sh
@@ -4,7 +4,6 @@ do
 	url=${imagename##*/}
 	helm install $url webhunt-charts/ --set url=$url
 done
-echo("wait for 7sec....")
+echo "wait for 7sec...."
 sleep 7
-bash generate_firefox_yml.sh > firefox.yml
-kubectl apply -f firefox.yml
+bash generate_firefox_yml.sh | kubectl apply -f - 
diff --git a/generate_firefox_yml.sh b/generate_firefox_yml.sh
@@ -25,5 +25,5 @@ do
 	ip=$(kubectl get svc $svc -o go-template={{.spec.clusterIP}})
 	echo "        - ip: \"$ip\"
           hostnames:
-            - \"$svc\""
+            - \"$svc.in\""
 done
diff --git a/riddles/2013/conf b/riddles/2013/conf
diff --git a/riddles/404/conf b/riddles/404/conf
diff --git a/riddles/8.8.8.8/conf b/riddles/8.8.8.8/conf
diff --git a/riddles/Great!/DoNotCheat.png b/riddles/Great!/DoNotCheat.png
diff --git a/riddles/Great!/conf b/riddles/Great!/conf
diff --git a/riddles/c++/conf b/riddles/c++/conf
@@ -1 +1 @@
-c++
+c-plus-plus
diff --git a/riddles/ctrl+s/conf b/riddles/ctrl+s/conf
@@ -1 +1 @@
-ctrl+s
+ctrl-plus-s
diff --git a/riddles/ctrl+z/conf b/riddles/ctrl+z/conf
@@ -1 +1 @@
-ctrl+z
+ctrl-plus-z
diff --git a/riddles/great/DoNotCheat.png b/riddles/great/DoNotCheat.png
diff --git a/riddles/2013/background.svg → riddles/great/background.svg b/riddles/2013/background.svg → riddles/great/background.svg
diff --git a/riddles/great/conf b/riddles/great/conf
@@ -0,0 +1 @@
+great
diff --git a/riddles/Great!/index.html → riddles/great/index.html b/riddles/Great!/index.html → riddles/great/index.html
diff --git a/riddles/Great!/test.cpp → riddles/great/test.cpp b/riddles/Great!/test.cpp → riddles/great/test.cpp
@@ -7,20 +7,20 @@
 
 		void ChangeIt(char Text[])
 		{
-		    for (int K = 1; Text[K] != '\0'; K++)
+                    int K;
+		    for (K = 1; Text[K] != '\0'; K++)
 		    {
 			if (Text[K] >= 'b' && Text[K] <= 'd') 
 			    Text[K-1] = 'e';
-			else if (Text[K] == '!') 
-			    Text[K-1] = 't';
 			else 
 			    Text[K-1] = Text[K];
 		    }
+                    Text[K-1] = 't';
 		}
 
 		int main()
 		{
-		    char oldText[] = "0Grca!";
+		    char oldText[] = "0grca";
 		    ChangeIt(oldText);
 		    cout <<  oldText << endl;
 		}

diff --git a/riddles/internetexplorer/conf b/riddles/internetexplorer/conf
@@ -1 +1,3 @@
 internetexplorer
+
+
diff --git a/riddles/kubernetes/DoNotCheat.png b/riddles/kubernetes/DoNotCheat.png
diff --git a/riddles/kubernetes/conf b/riddles/kubernetes/conf
diff --git a/riddles/2013/DoNotCheat.png → riddles/n2013/DoNotCheat.png b/riddles/2013/DoNotCheat.png → riddles/n2013/DoNotCheat.png
diff --git a/riddles/404/background.svg → riddles/n2013/background.svg b/riddles/404/background.svg → riddles/n2013/background.svg
diff --git a/riddles/n2013/conf b/riddles/n2013/conf
@@ -0,0 +1 @@
+n2013
diff --git a/riddles/2013/index.html → riddles/n2013/index.html b/riddles/2013/index.html → riddles/n2013/index.html
diff --git a/riddles/404/DoNotCheat.png → riddles/n404/DoNotCheat.png b/riddles/404/DoNotCheat.png → riddles/n404/DoNotCheat.png
diff --git a/riddles/8.8.8.8/background.svg → riddles/n404/background.svg b/riddles/8.8.8.8/background.svg → riddles/n404/background.svg
diff --git a/riddles/n404/conf b/riddles/n404/conf
@@ -0,0 +1 @@
+n404
diff --git a/riddles/404/index.html → riddles/n404/index.html b/riddles/404/index.html → riddles/n404/index.html
diff --git a/riddles/8.8.8.8/DoNotCheat.png → riddles/n8-8-8-8/DoNotCheat.png b/riddles/8.8.8.8/DoNotCheat.png → riddles/n8-8-8-8/DoNotCheat.png
diff --git a/riddles/Great!/background.svg → riddles/n8-8-8-8/background.svg b/riddles/Great!/background.svg → riddles/n8-8-8-8/background.svg
diff --git a/riddles/n8-8-8-8/conf b/riddles/n8-8-8-8/conf
@@ -0,0 +1 @@
+n8-8-8-8
diff --git a/riddles/8.8.8.8/index.html → riddles/n8-8-8-8/index.html b/riddles/8.8.8.8/index.html → riddles/n8-8-8-8/index.html
diff --git a/riddles/no1/conf b/riddles/no1/conf
@@ -1 +1 @@
-no
+no1
diff --git a/riddles/no2/conf b/riddles/no2/conf
@@ -1 +1 @@
-no
+no2
diff --git a/riddles/no3/conf b/riddles/no3/conf
@@ -1 +1 @@
-no
+no3
diff --git a/riddles/openstack/DoNotCheat.png b/riddles/openstack/DoNotCheat.png
diff --git a/riddles/kubernetes/background.svg → riddles/openstack/background.svg b/riddles/kubernetes/background.svg → riddles/openstack/background.svg
diff --git a/riddles/openstack/conf b/riddles/openstack/conf
@@ -0,0 +1 @@
+openstack
diff --git a/riddles/kubernetes/index.html → riddles/openstack/index.html b/riddles/kubernetes/index.html → riddles/openstack/index.html
diff --git a/riddles/theQRshit/DoNotCheat.png b/riddles/theQRshit/DoNotCheat.png
diff --git a/riddles/theQRshit/conf b/riddles/theQRshit/conf
diff --git a/riddles/theqrshit/DoNotCheat.png b/riddles/theqrshit/DoNotCheat.png
diff --git a/riddles/theQRshit/background.svg → riddles/theqrshit/background.svg b/riddles/theQRshit/background.svg → riddles/theqrshit/background.svg
diff --git a/riddles/theqrshit/conf b/riddles/theqrshit/conf
@@ -0,0 +1,2 @@
+theqrshit
+
diff --git a/riddles/theQRshit/index.html → riddles/theqrshit/index.html b/riddles/theQRshit/index.html → riddles/theqrshit/index.html
@@ -37,7 +37,7 @@
 
 <body>
 	<div class="querybox">
-		<h3>Why are you staring screen? <br><br>Just scan the QR</h3>
+		<h3>Why are you staring the screen? <br><br>Just scan the QR</h3>
 		<img src="DoNotCheat.png">
 	</div>
 

diff --git a/roles/build_images/files/.dockerignore b/roles/build_images/files/.dockerignore
@@ -1,2 +1,3 @@
 Dockerfile
 conf
+*.cpp
diff --git a/webhunt-charts/templates/service.yaml b/webhunt-charts/templates/service.yaml
@@ -3,7 +3,8 @@ kind: Service
 metadata:
   name: {{.Values.url}}
 spec:
+  selector:
+    website: {{.Values.url}}
   ports:
-    - protocol: TCP
-      port: 80
+    - port: 80
       targetPort: 80