Skip to content
Snippets Groups Projects
Commit 7f64dd91 authored by project_12982_bot's avatar project_12982_bot
Browse files

automatic push at 2021-12-10-0000

parent 44c1a319
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 78 additions and 121 deletions
README.md
+ 4
− 8
View file @ 7f64dd91
......@@ -42,14 +42,10 @@ I have also done the optional feature of this task and set up nginx to generate
sudo nano /etc/nginx/fcgiwrap.conf
I have made a copy and stored it inside the config folder. The file includes, among other things, the location and the root. After this I made the overview.cgi inside /usr/lib/cgi-bin, because in fcgiwrap.conf I specified the root to be /usr/lib. The overview.cgi script is using bash to make a overview page based on the htmllist.txt file that changes by the overview.sh. Overview.cgi reads the htmllist.txt with cat, sorts it and stores it in a variable. Then it echo all the html code as well as the variable. This makes a overview page that updates everytime the htmllist.txt updates. Nginx finds the individual html pages inside /home/pi/git/exam/htmlfiles, because, as I already mention, I changed the root to /home/pi/git/exam inside /etc/nginx/sites-available/default. I also changed the default file so it also includes fcgiwrap.conf inside the server section:
I have made a copy and stored it inside the config folder. The file includes, among other things, the location and the root. After this I made the overview.cgi inside /usr/lib/cgi-bin, because in fcgiwrap.conf I specified the root to be /usr/lib. The overview.cgi script is using bash to make a overview page based on the htmllist.txt file that changes by the overview.sh. Overview.cgi reads the htmllist.txt with cat, sorts it and stores it in a variable. When you click on the links to the news article you will be redirected to the htmlfiles that is stored inside this project directory. In other words, the html files of the news articles is run by nginx and the cgi script is run by nginx via fcgi fcgi wrap. Therefore, in the script, I used sed to include the localhost in the html attribute href. Then the script echo all the html code as well as the variable. This makes a overview page that updates everytime the htmllist.txt updates. Nginx finds the individual html pages inside /home/pi/git/exam/htmlfiles, because, as I already mention, I changed the root to /home/pi/git/exam inside /etc/nginx/sites-available/default. I also changed the default file so it also includes fcgiwrap.conf inside the server section:
include /etc/nginx/fcgiwrap.conf;
and I gave the server a name:
server_name idg1100-ingring.dynv6.net;
After changing nginx I wrote sudo nginx -t in the terminal and got this output:
sudo nginx -t
......@@ -61,7 +57,7 @@ And then I reload the nginx server to get everything working:
sudo nginx -s reload
The overview page can also be reached with your raspberry pi IP address:
The overview page can also be reached with your raspberry pi IP address, but you have to include :
http://localhost/cgi-bin/overview.cgi
......@@ -113,7 +109,7 @@ The gitrepo.sh script is an optional task and updates the local and the centrali
Then clone the project in this way, replacing the $PROJECT_TOKEN with the actual token:
git clone https://exam:$PROJECT_TOKEN@gitlab.stud.idi.ntnu.no/ingring/exam.git
git clone https://exam:ZqPZxzPx4fCo3GXtTpHJ@gitlab.stud.idi.ntnu.no/ingring/exam.git
<h2>deployment.sh</h2>
......@@ -121,4 +117,4 @@ Finally I made the deployment script. The deployment.sh is an optional script an
chmod +x deployment.sh
I tried to run the deployment.sh on an virtual machine, however the schedule-exam.timer refuses to start. It says that the trigger was not loaded.
\ No newline at end of file
I tried to run the deployment.sh on an virtual machine, however the schedule-exam.timer refuses to start. It says that the trigger was not loaded. I do not know why this happened. I do enable and start both the schedule-exam.service and schedule-exam.timer in the deployment.sh.
\ No newline at end of file
htmlfiles/2021-12-09-2123/news2-tv2nyheter.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Steve Bronski fra Bronski Beat er død</title>
</head>
<body>
<h1>tv2nyheter: Steve Bronski fra Bronski Beat er død</h1>
<img src="https://www.cdn.tv2.no/images/14418946.jpg?imageId=14418946&panow=100&panoh=23.913043478261&panox=0&panoy=11.628540372671&heightw=100&heighth=39.510258107214&heightx=0&heighty=9.4639311714097&width=600&height=315">
<p>Fetched on 2021-12-09-2123 <a href="https://www.tv2.no/nyheter/14418939/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2123/news3-tv2nyheter.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Bykle gir innbyggerne 3000 kroner i strømtilskudd</title>
</head>
<body>
<h1>tv2nyheter: Bykle gir innbyggerne 3000 kroner i strømtilskudd</h1>
<img src="https://www.cdn.tv2.no/images/14418905.jpg?imageId=14418905&panow=100&panoh=50.993377483444&panox=0&panoy=23.602582781457&heightw=24.433249370277&heighth=59.848484848485&heightx=41.813602015113&heighty=6.0364772727273&width=600&height=315">
<p>Fetched on 2021-12-09-2123 <a href="https://www.tv2.no/nyheter/14418895/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2123/news4-nrkinnlandet.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>nrkinnlandet: Partikollegaer vil se konsekvenser etter at Erik S. Winther trosset Ap i fylkestinget </title>
</head>
<body>
<h1>nrkinnlandet: Partikollegaer vil se konsekvenser etter at Erik S. Winther trosset Ap i fylkestinget </h1>
<img src="https://gfx.nrk.no/zTxo_UJsX21Yez_8XY9idAMuYsC_t1468SOuXw3WtmMQ.jpg">
<p>Fetched on 2021-12-09-2123 <a href="https://www.nrk.no/innlandet/partikollegaer-vil-se-konsekvenser-etter-at-erik-s.-winther-trosset-ap-i-fylkestinget-1.15765370">at nrkinnlandet</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2123/news5-nrkinnlandet.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </title>
</head>
<body>
<h1>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </h1>
<img src="https://gfx.nrk.no/vhF-EOqTui946a0-JQQ-9gbMEa8gvHIM5vs3V3PFI6_A.jpg">
<p>Fetched on 2021-12-09-2123 <a href="https://www.nrk.no/innlandet/leder-for-tufsingdalen-bondelag-er-fortvila-over-reinflokker-1.15764273">at nrkinnlandet</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2123/news6-nrkinnlandet.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </title>
</head>
<body>
<h1>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </h1>
<img src="https://gfx.nrk.no/eF_qcLsWg0lWXNt6mHh1CApAf86dvb4-dsgn9CEUPJeQ.jpg">
<p>Fetched on 2021-12-09-2123 <a href="https://www.nrk.no/innlandet/hvem-vinner-klassequizen-i-innlandet_-1.15658127">at nrkinnlandet</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2322/news1-tv2nyheter.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Nakstad om mangelen på hurtigtester: - Jobber hardt for å dekke behovet</title>
</head>
<body>
<h1>tv2nyheter: Nakstad om mangelen på hurtigtester: - Jobber hardt for å dekke behovet</h1>
<img src="https://www.cdn.tv2.no/images/14418969.jpg?imageId=14418969&panow=100&panoh=100&panox=0&panoy=0&heightw=34.519572953737&heighth=100&heightx=0&heighty=0&width=600&height=315">
<p>Fetched on 2021-12-09-2322 <a href="https://www.tv2.no/nyheter/14418407/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2322/news2-tv2nyheter.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Steve Bronski fra Bronski Beat er død</title>
</head>
<body>
<h1>tv2nyheter: Steve Bronski fra Bronski Beat er død</h1>
<img src="https://www.cdn.tv2.no/images/14418946.jpg?imageId=14418946&panow=100&panoh=23.913043478261&panox=0&panoy=11.628540372671&heightw=100&heighth=39.510258107214&heightx=0&heighty=9.4639311714097&width=600&height=315">
<p>Fetched on 2021-12-09-2322 <a href="https://www.tv2.no/nyheter/14418939/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2322/news3-tv2nyheter.html deleted 100644 → 0
+ 0
− 12
View file @ 44c1a319
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Bykle gir innbyggerne 3000 kroner i strømtilskudd</title>
</head>
<body>
<h1>tv2nyheter: Bykle gir innbyggerne 3000 kroner i strømtilskudd</h1>
<img src="https://www.cdn.tv2.no/images/14418905.jpg?imageId=14418905&panow=100&panoh=50.993377483444&panox=0&panoy=23.602582781457&heightw=24.433249370277&heighth=59.848484848485&heightx=41.813602015113&heighty=6.0364772727273&width=600&height=315">
<p>Fetched on 2021-12-09-2322 <a href="https://www.tv2.no/nyheter/14418895/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-10-0000/news1-tv2nyheter.html 0 → 100644
+ 12
− 0
View file @ 7f64dd91
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Domstol avviser Trumps forsøk på å holde dokumenter unna granskningskomité</title>
</head>
<body>
<h1>tv2nyheter: Domstol avviser Trumps forsøk på å holde dokumenter unna granskningskomité</h1>
<img src="https://www.tv2.no/view-resources/baseview/public/common/lab_assets/img/logo/tv2-default.jpg">
<p>Fetched on 2021-12-10-0000 <a href="https://www.tv2.no/nyheter/14419037/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-10-0000/news2-tv2nyheter.html 0 → 100644
+ 12
− 0
View file @ 7f64dd91
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2nyheter: Arbeiderpartiet åpner for å utsette ny nettleieordning</title>
</head>
<body>
<h1>tv2nyheter: Arbeiderpartiet åpner for å utsette ny nettleieordning</h1>
<img src="https://www.cdn.tv2.no/images/14419030.jpg?imageId=14419030&panow=100&panoh=50.993377483444&panox=0&panoy=11.920529801325&heightw=40.928270042194&heighth=100&heightx=33.333333333333&heighty=0&width=600&height=315">
<p>Fetched on 2021-12-10-0000 <a href="https://www.tv2.no/nyheter/14419026/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2123/news1-tv2nyheter.html → htmlfiles/2021-12-10-0000/news3-tv2nyheter.html
+ 1
− 1
View file @ 7f64dd91
......@@ -7,6 +7,6 @@
<body>
<h1>tv2nyheter: Nakstad om mangelen på hurtigtester: - Jobber hardt for å dekke behovet</h1>
<img src="https://www.cdn.tv2.no/images/14418969.jpg?imageId=14418969&panow=100&panoh=100&panox=0&panoy=0&heightw=34.519572953737&heighth=100&heightx=0&heighty=0&width=600&height=315">
<p>Fetched on 2021-12-09-2123 <a href="https://www.tv2.no/nyheter/14418407/">at tv2nyheter</a></p>
<p>Fetched on 2021-12-10-0000 <a href="https://www.tv2.no/nyheter/14418407/">at tv2nyheter</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2322/news4-nrkinnlandet.html → htmlfiles/2021-12-10-0000/news4-nrkinnlandet.html
+ 1
− 1
View file @ 7f64dd91
......@@ -7,6 +7,6 @@
<body>
<h1>nrkinnlandet: Partikollegaer vil se konsekvenser etter at Erik S. Winther trosset Ap i fylkestinget </h1>
<img src="https://gfx.nrk.no/zTxo_UJsX21Yez_8XY9idAMuYsC_t1468SOuXw3WtmMQ.jpg">
<p>Fetched on 2021-12-09-2322 <a href="https://www.nrk.no/innlandet/partikollegaer-vil-se-konsekvenser-etter-at-erik-s.-winther-trosset-ap-i-fylkestinget-1.15765370">at nrkinnlandet</a></p>
<p>Fetched on 2021-12-10-0000 <a href="https://www.nrk.no/innlandet/partikollegaer-vil-se-konsekvenser-etter-at-erik-s.-winther-trosset-ap-i-fylkestinget-1.15765370">at nrkinnlandet</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2322/news5-nrkinnlandet.html → htmlfiles/2021-12-10-0000/news5-nrkinnlandet.html
+ 1
− 1
View file @ 7f64dd91
......@@ -7,6 +7,6 @@
<body>
<h1>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </h1>
<img src="https://gfx.nrk.no/vhF-EOqTui946a0-JQQ-9gbMEa8gvHIM5vs3V3PFI6_A.jpg">
<p>Fetched on 2021-12-09-2322 <a href="https://www.nrk.no/innlandet/leder-for-tufsingdalen-bondelag-er-fortvila-over-reinflokker-1.15764273">at nrkinnlandet</a></p>
<p>Fetched on 2021-12-10-0000 <a href="https://www.nrk.no/innlandet/leder-for-tufsingdalen-bondelag-er-fortvila-over-reinflokker-1.15764273">at nrkinnlandet</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-09-2322/news6-nrkinnlandet.html → htmlfiles/2021-12-10-0000/news6-nrkinnlandet.html
+ 1
− 1
View file @ 7f64dd91
......@@ -7,6 +7,6 @@
<body>
<h1>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </h1>
<img src="https://gfx.nrk.no/eF_qcLsWg0lWXNt6mHh1CApAf86dvb4-dsgn9CEUPJeQ.jpg">
<p>Fetched on 2021-12-09-2322 <a href="https://www.nrk.no/innlandet/hvem-vinner-klassequizen-i-innlandet_-1.15658127">at nrkinnlandet</a></p>
<p>Fetched on 2021-12-10-0000 <a href="https://www.nrk.no/innlandet/hvem-vinner-klassequizen-i-innlandet_-1.15658127">at nrkinnlandet</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-10-0000/news7-tv2sport.html 0 → 100644
+ 12
− 0
View file @ 7f64dd91
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2sport: Hegerberg-show i storseier - nådde ny milepæl</title>
</head>
<body>
<h1>tv2sport: Hegerberg-show i storseier - nådde ny milepæl</h1>
<img src="https://www.cdn.tv2.no/images/14418999.jpg?imageId=14418999&panow=100&panoh=53.846153846154&panox=0&panoy=0&heightw=100&heighth=100&heightx=0&heighty=0&width=600&height=315">
<p>Fetched on 2021-12-10-0000 <a href="https://www.tv2.no/sport/14418994/">at tv2sport</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-10-0000/news8-tv2sport.html 0 → 100644
+ 12
− 0
View file @ 7f64dd91
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2sport: Ubeseiret i gruppespillet: - Knutsen er det nærmeste vi kommer Harry Potter</title>
</head>
<body>
<h1>tv2sport: Ubeseiret i gruppespillet: - Knutsen er det nærmeste vi kommer Harry Potter</h1>
<img src="https://www.cdn.tv2.no/images/14418837.jpg?imageId=14418837&panow=100&panoh=52.027027027027&panox=0&panoy=15.540540540541&heightw=100&heighth=100&heightx=0&heighty=0&width=600&height=315">
<p>Fetched on 2021-12-10-0000 <a href="https://www.tv2.no/sport/14418442/">at tv2sport</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
htmlfiles/2021-12-10-0000/news9-tv2sport.html 0 → 100644
+ 12
− 0
View file @ 7f64dd91
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>tv2sport: Svensk show da serielederen ble slått</title>
</head>
<body>
<h1>tv2sport: Svensk show da serielederen ble slått</h1>
<img src="https://www.cdn.tv2.no/images/10869557.jpg?imageId=10869557&panow=100&panoh=50.993377483444&panox=0&panoy=0&heightw=100&heighth=100&heightx=0&heighty=0&width=600&height=315">
<p>Fetched on 2021-12-10-0000 <a href="https://www.tv2.no/sport/14418668/">at tv2sport</a></p>
Go back to <a href="/index.html">overview page</a>
</body>
index.html
+ 9
− 12
View file @ 7f64dd91
......@@ -4,18 +4,15 @@
<body>
<h1>Overview of recent news</h1>
<ul>
<li><a href='htmlfiles/2021-12-09-2322/news6-nrkinnlandet.html'>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </li>
<li><a href='htmlfiles/2021-12-09-2322/news5-nrkinnlandet.html'>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </li>
<li><a href='htmlfiles/2021-12-09-2322/news4-nrkinnlandet.html'>nrkinnlandet: Partikollegaer vil se konsekvenser etter at Erik S. Winther trosset Ap i fylkestinget </li>
<li><a href='htmlfiles/2021-12-09-2322/news3-tv2nyheter.html'>tv2nyheter: Bykle gir innbyggerne 3000 kroner i strømtilskudd</li>
<li><a href='htmlfiles/2021-12-09-2322/news2-tv2nyheter.html'>tv2nyheter: Steve Bronski fra Bronski Beat er død</li>
<li><a href='htmlfiles/2021-12-09-2322/news1-tv2nyheter.html'>tv2nyheter: Nakstad om mangelen på hurtigtester: - Jobber hardt for å dekke behovet</li>
<li><a href='htmlfiles/2021-12-09-2123/news6-nrkinnlandet.html'>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </li>
<li><a href='htmlfiles/2021-12-09-2123/news5-nrkinnlandet.html'>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </li>
<li><a href='htmlfiles/2021-12-09-2123/news4-nrkinnlandet.html'>nrkinnlandet: Partikollegaer vil se konsekvenser etter at Erik S. Winther trosset Ap i fylkestinget </li>
<li><a href='htmlfiles/2021-12-09-2123/news3-tv2nyheter.html'>tv2nyheter: Bykle gir innbyggerne 3000 kroner i strømtilskudd</li>
<li><a href='htmlfiles/2021-12-09-2123/news2-tv2nyheter.html'>tv2nyheter: Steve Bronski fra Bronski Beat er død</li>
<li><a href='htmlfiles/2021-12-09-2123/news1-tv2nyheter.html'>tv2nyheter: Nakstad om mangelen på hurtigtester: - Jobber hardt for å dekke behovet</li>
<li><a href='htmlfiles/2021-12-10-0000/news9-tv2sport.html'>tv2sport: Svensk show da serielederen ble slått</li>
<li><a href='htmlfiles/2021-12-10-0000/news8-tv2sport.html'>tv2sport: Ubeseiret i gruppespillet: - Knutsen er det nærmeste vi kommer Harry Potter</li>
<li><a href='htmlfiles/2021-12-10-0000/news7-tv2sport.html'>tv2sport: Hegerberg-show i storseier - nådde ny milepæl</li>
<li><a href='htmlfiles/2021-12-10-0000/news6-nrkinnlandet.html'>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </li>
<li><a href='htmlfiles/2021-12-10-0000/news5-nrkinnlandet.html'>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </li>
<li><a href='htmlfiles/2021-12-10-0000/news4-nrkinnlandet.html'>nrkinnlandet: Partikollegaer vil se konsekvenser etter at Erik S. Winther trosset Ap i fylkestinget </li>
<li><a href='htmlfiles/2021-12-10-0000/news3-tv2nyheter.html'>tv2nyheter: Nakstad om mangelen på hurtigtester: - Jobber hardt for å dekke behovet</li>
<li><a href='htmlfiles/2021-12-10-0000/news2-tv2nyheter.html'>tv2nyheter: Arbeiderpartiet åpner for å utsette ny nettleieordning</li>
<li><a href='htmlfiles/2021-12-10-0000/news1-tv2nyheter.html'>tv2nyheter: Domstol avviser Trumps forsøk på å holde dokumenter unna granskningskomité</li>
<li><a href='htmlfiles/2021-12-09-2108/news6-nrkinnlandet.html'>nrkinnlandet: Hvem vinner Klassequizen i Innlandet? </li>
<li><a href='htmlfiles/2021-12-09-2108/news5-nrkinnlandet.html'>nrkinnlandet: Melder om omikronutbrudd i Gjøvik kommune </li>
<li><a href='htmlfiles/2021-12-09-2108/news4-nrkinnlandet.html'>nrkinnlandet: Leder for Tufsingdalen bondelag er fortvila over reinflokker </li>
......
overview.cgi
+ 1
− 1
View file @ 7f64dd91
#!/bin/bash
#reverses the list of all the html files so the newest html goes on the top
reversed=$(cat htmllist.txt | sort -r | sed -E 's|htmlfiles|http://idg1100-ingring.dynv6.net/htmlfiles|g')
reversed=$(cat htmllist.txt | sort -r | sed -E 's|htmlfiles|http://localhost/htmlfiles|g')
echo "content-type: text/html"
echo ""
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment