Просмотр исходного кода

Exclude per-install secrets from release tarball and repo

Toby Chui 1 день назад
Родитель
Сommit
2e0c0a0230
3 измененных файлов с 11 добавлено и 4 удалено
  1. 5 0
      .gitignore
  2. 6 1
      src/Makefile
  3. 0 3
      src/system/telegram_conf.json

+ 5 - 0
.gitignore

@@ -56,3 +56,8 @@ src/system/git/
 /src/system/cache
 /src/system/mail
 /test
+
+# Per-install runtime data (mail secret key/db, cluster node identity)
+src/system/mail/
+src/system/cluster/
+src/system/cluster.db

+ 6 - 1
src/Makefile

@@ -48,6 +48,11 @@ web.tar.gz:
 	-rm ./dist/system/cron.json
 	-rm ./dist/system/bridge.json
 	-rm ./dist/system/auth/authlog.db
+	-rm -rf ./dist/system/git/
+	-rm -rf ./dist/system/mail/
+	-rm -rf ./dist/system/cluster/
+	-rm ./dist/system/cluster.db
+	-rm ./dist/system/telegram_conf.json
 	
 	@ echo "Remove ip2country, todo: Add binary base searching for this function"
 	-rm -rf "./dist/system/ip2country"
@@ -60,7 +65,7 @@ web.tar.gz:
 
 	@echo "Creating tarball for all required files"
 	-rm ./dist/web.tar.gz
-	-cd ./dist/ && tar --exclude='*.psd' -czf ./web.tar.gz system/ web/
+	-cd ./dist/ && COPYFILE_DISABLE=1 tar --exclude='*.psd' --exclude='.DS_Store' --exclude='._*' -czf ./web.tar.gz system/ web/
 
 	@echo "Clearing up unzipped folder structures"
 	-rm -rf "./dist/web"

+ 0 - 3
src/system/telegram_conf.json

@@ -1,3 +0,0 @@
-{
- "BotToken": ""
-}