update Vagrantfile

create link to map directory at right position
use ubuntu/jammy64 (22.04) as base image
2022-02-27 22:36:18 +01:00 · 2022-02-27 22:35:36 +01:00 · 2022-02-27 22:34:57 +01:00 · 2022-02-23 16:54:07 +01:00 · 2022-02-23 16:53:37 +01:00 · 2022-02-23 16:52:44 +01:00
5 changed files with 27 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,12 @@ Network Trash Folder
 Temporary Items
 .apdisk

+## Vagrant
+.vagrant/
+
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.log
+
 ## Project Files
 wsgi/.idea
 www/dlsv
@@ -47,3 +53,4 @@ www/data/events.xml
 www/data/geolocation.js
 scripts/*.json
 scripts/*.xml
+
--- a/16
+++ b/16
@@ -0,0 +1,16 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/jammy64"
+  config.vm.synced_folder ".", "/vagrant"
+  config.vm.network(:forwarded_port, guest: 80, host: 8888)
+
+  config.vm.provision :shell, inline: <<-SHELL
+    sudo apt-get -y update
+    sudo apt-get -y install nginx
+
+    echo "Starting nginx..."
+    sudo ln -s /vagrant/www /var/www/html/map
+    sudo cp /vagrant/www/index.html.en /vagrant/www/index.html
+    sudo useradd -s /bin/false nginx
+    sudo service nginx restart
+  SHELL
+end
--- a/www/data/specialevents.js
+++ b/www/data/specialevents.js
@@ -6,5 +6,6 @@ var specialEvents = [
 	// 'bug2016vico', // Central Italy 6.5
 	// 'bug2017rfxe', // CTBT violation North Korea 6.1
 	// 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0
-	'bug2021vtgi' // Geilenkirchen 1.9
+	'bug2021vtgi', // Geilenkirchen 1.9
+	'bug2022ahxi' // Erftstadt 2.9
 ];
--- a/www/events.js
+++ b/www/events.js
@@ -47,7 +47,7 @@ function getGeolocation(id, lat, lng) {
 					var city = json.features[0].properties.city;
 					var countryCode = json.features[0].properties.country;
 					geolocationTable[id] = city;
-					( countryCode != "Germany" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
+					( countryCode != "Germany" && countryCode != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
 					if ( city ) {
 						$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
 						var sort = [[0,1],[1,1],[2,1]];
--- a/www/events.js.en
+++ b/www/events.js.en
@@ -47,7 +47,7 @@ function getGeolocation(id, lat, lng) {
 					var city = json.features[0].properties.city;
 					var countryCode = json.features[0].properties.country;
 					geolocationTable[id] = city;
-					( countryCode != "Germany" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
+					( countryCode != "Germany" && countryCode != "Deutschland" ) ? geolocationTable[id] = geolocationTable[id] + " ("+countryCode+")" : null;
 					if ( city ) {
 						$("#eventstable a.toggle[eventid="+id+"]").text(geolocationTable[id]);
 						var sort = [[0,1],[1,1],[2,1]];
Author	SHA1	Message	Date
Kasper D. Fischer	a2713522c9	update Vagrantfile create link to map directory at right position	2022-02-27 22:36:18 +01:00
Kasper D. Fischer	a1e044c082	use ubuntu/jammy64 (22.04) as base image	2022-02-27 22:35:36 +01:00
Kasper D. Fischer	4c7a1c6916	update .gitignore ignore .vagrant directory	2022-02-27 22:34:57 +01:00
Kasper D. Fischer	5d38db389d	Merge branch 'develop' into feature/vagrant	2022-02-23 16:54:07 +01:00
Kasper D. Fischer	9333db3d29	test for "Deutschland" in contryCode when doing geolocation lookup.	2022-02-23 16:53:37 +01:00
Kasper D. Fischer	2d287ea304	add event bug2020ahxi (Erftstadt 2.9) to specialevents.js	2022-02-23 16:52:44 +01:00
Kasper D. Fischer	34f1bd4877	Merge branch 'develop' into feature/vagrant	2022-02-23 14:32:41 +01:00
Kasper D. Fischer	8b4df0c04d	add Vagrant file	2022-02-23 13:51:16 +01:00
Kasper D. Fischer	42588db791	change URL of photon service by komoot to photon.komoot.io	2022-02-23 13:41:08 +01:00