make smaller

5 files changed, 27 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49359a6a4b5c..5dd1d3ee3834 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = earthwalker-git
 	pkgdesc = A selfhosted browsergame in which you find out where you are by navigating StreetView.
 	pkgver = r272.c4b7337
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/glatteis/earthwalker
 	install = earthwalker.install
 	arch = i686
@@ -14,20 +14,19 @@ pkgbase = earthwalker-git
 	makedepends = npm
 	provides = earthwalker
 	conflicts = earthwalker
-	backup = etc/earthwalker/earthwalker.env
 	backup = etc/earthwalker/config.toml
 	source = git+https://gitlab.com/glatteis/earthwalker.git
 	source = earthwalker.install
-	source = earthwalker.env
 	source = earthwalker.service
 	source = earthwalker.sysusers.conf
 	source = earthwalker.tmpfiles.conf
+	source = 0001-Adapt-Config.patch
 	sha512sums = SKIP
 	sha512sums = 484d5b10b83202dcf0bc0b0717c637f806f1a457d54dd78185ad56316cfbef49ab16338d15994cde1923b1f31cfcac6d7b7b66e15051c3f59fa85f3df9c6daab
-	sha512sums = 7e4c63f7e01898c66532206cdae3f8b0262edc73b066f1d6d3c42a2443876cd03acbb3a7ee9a91b59f736ab81d04a6e796b0269ee88dc04292f698efc795f38d
-	sha512sums = 4942bf0b14248e6cc144c8dd31ab82182bfee6c927f07e9ff6269de67a95eb6ab2567119ed9af898131706be997f4b71cb3b6050899aff5049e4372e89feb361
+	sha512sums = 754aaed7d7e039a45266a217376607fe54f7e2fefaaeef6c4d604572bd45147947ba607b0d71cb5f5c7ab02fea682c45838edeff2b6fff6565da94511cd063b7
 	sha512sums = 03823fd28e00034932e6f30912f93f6c58cf5897a99bc4c9b96cda73bb17e0391c9a3937ef587ddd9bac54581f9337f86046b0ce29af3702444f162baca33439
 	sha512sums = c2ddeba33f565ffa2a78ffedfaacb5e0ed8030c67c2f45e3286261b7e005739d3c4cd16ce5e59c46c9eba14f514270ccae343c4879d11f57d418cb596a9a8e1e
+	sha512sums = bb357c1c64d6451fe9eb93c946ade46d174108fdbe04b79b89ac5116accef11ab332349b7f4329887efa2a73620dbf8c5b0cc4288ab08aa16b0740d82a6f76b4
 
 pkgname = earthwalker-git
 
diff --git a/0001-Adapt-Config.patch b/0001-Adapt-Config.patch
new file mode 100644
index 000000000000..aa64efbd0fe6
--- /dev/null
+++ b/0001-Adapt-Config.patch
@@ -0,0 +1,10 @@
+--- a/config.toml.sample
++++ b/config.toml.sample
+@@ -1,5 +1,5 @@
+ Port = "8080"
+-DBPath = "./badger"
+-StaticPath = "./"
++DBPath = "/var/lib/earthwalker/badger"
++StaticPath = "/usr/share/earthwalker"
+ TileServerURL = "https://tiles.wmflabs.org/osm/{z}/{x}/{y}.png"
+ NoLabelTileServerURL = "https://tiles.wmflabs.org/osm-no-labels/{z}/{x}/{y}.png"
diff --git a/PKGBUILD b/PKGBUILD
index 213855e71e50..9195d42ab5f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=earthwalker-git
 _pkgbase=earthwalker
 pkgver=r272.c4b7337
-pkgrel=1
+pkgrel=2
 pkgdesc="A selfhosted browsergame in which you find out where you are by navigating StreetView."
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url="https://gitlab.com/glatteis/earthwalker"
@@ -14,21 +14,20 @@ makedepends=('go' 'git' 'npm')
 provides=("$_pkgbase") 
 optdepends=()
 conflicts=("${_pkgbase}")
-backup=("etc/${_pkgbase}/${_pkgbase}.env" "etc/${_pkgbase}/config.toml")
+backup=("etc/${_pkgbase}/config.toml")
 install=earthwalker.install
 source=('git+https://gitlab.com/glatteis/earthwalker.git'
 	"${_pkgbase}.install"
-	"${_pkgbase}.env"
 	"${_pkgbase}.service"
 	"${_pkgbase}.sysusers.conf"
-	"${_pkgbase}.tmpfiles.conf")
-#	"0001-Disable-Vault.patch")
+	"${_pkgbase}.tmpfiles.conf"
+	"0001-Adapt-Config.patch")
 sha512sums=('SKIP'
             '484d5b10b83202dcf0bc0b0717c637f806f1a457d54dd78185ad56316cfbef49ab16338d15994cde1923b1f31cfcac6d7b7b66e15051c3f59fa85f3df9c6daab'
-            '7e4c63f7e01898c66532206cdae3f8b0262edc73b066f1d6d3c42a2443876cd03acbb3a7ee9a91b59f736ab81d04a6e796b0269ee88dc04292f698efc795f38d'
-            '4942bf0b14248e6cc144c8dd31ab82182bfee6c927f07e9ff6269de67a95eb6ab2567119ed9af898131706be997f4b71cb3b6050899aff5049e4372e89feb361'
+            '754aaed7d7e039a45266a217376607fe54f7e2fefaaeef6c4d604572bd45147947ba607b0d71cb5f5c7ab02fea682c45838edeff2b6fff6565da94511cd063b7'
             '03823fd28e00034932e6f30912f93f6c58cf5897a99bc4c9b96cda73bb17e0391c9a3937ef587ddd9bac54581f9337f86046b0ce29af3702444f162baca33439'
-            'c2ddeba33f565ffa2a78ffedfaacb5e0ed8030c67c2f45e3286261b7e005739d3c4cd16ce5e59c46c9eba14f514270ccae343c4879d11f57d418cb596a9a8e1e')
+            'c2ddeba33f565ffa2a78ffedfaacb5e0ed8030c67c2f45e3286261b7e005739d3c4cd16ce5e59c46c9eba14f514270ccae343c4879d11f57d418cb596a9a8e1e'
+            'bb357c1c64d6451fe9eb93c946ade46d174108fdbe04b79b89ac5116accef11ab332349b7f4329887efa2a73620dbf8c5b0cc4288ab08aa16b0740d82a6f76b4')
 
 
 pkgver() {
@@ -41,7 +40,7 @@ pkgver() {
 
 build() {
 	cd "$srcdir/$_pkgbase"
-	#patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch"
+	patch -N -p1 -i "$srcdir/0001-Adapt-Config.patch"
 	make
 }
 
@@ -59,7 +58,7 @@ package() {
 	install -D -m 0644 "$srcdir/${_pkgbase}.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/${_pkgbase}.conf"
 	
 	# copy default config files
-	install -D -m 0644 "$srcdir/${_pkgbase}.env" "$pkgdir/etc/${_pkgbase}/${_pkgbase}.env"
+	#install -D -m 0644 "$srcdir/${_pkgbase}.env" "$pkgdir/etc/${_pkgbase}/${_pkgbase}.env"
 	install -D -m 0644 "$srcdir/$_pkgbase/config.toml.sample" "$pkgdir/etc/${_pkgbase}/config.toml"
 
 	# copy application data
diff --git a/earthwalker.env b/earthwalker.env
index b2809ad5930b..9e7cc7c2d5cd 100644
--- a/earthwalker.env
+++ b/earthwalker.env
@@ -1,8 +1,10 @@
+### IMPORTANT!!! THIS FILE IS NO LONGER USED! ANYTHING IN HERE CAN BE CONFIGURED IN CONFIG.TOML/EARTHWALKER.SERVICE!!! ###
+
 ### Paths
 
 # The path where the static files, like javascript and templates are located.`static` and `templates` are expected to be subdirectories of the specified path. Defaults to the location of the binary.
 #EARTHWALKER_STATIC_PATH=<location of binary>
-EARTHWALKER_STATIC_PATH=/usr/share/earthwalker/
+EARTHWALKER_STATIC_PATH=/usr/share/earthwalker/public
 
 
 # The path where the config file is located. Defaults to $PWD/config.toml
diff --git a/earthwalker.service b/earthwalker.service
index ec4577f40d99..8980041e1074 100644
--- a/earthwalker.service
+++ b/earthwalker.service
@@ -9,7 +9,7 @@ User=earthwalker
 Group=earthwalker
 
 # The location of the .env file for configuration
-EnvironmentFile=/etc/earthwalker/earthwalker.env
+Environment=EARTHWALKER_CONFIG_PATH=/etc/earthwalker/config.toml
 # The location of the compiled binary
 ExecStart=/usr/bin/earthwalker