updated bootstrap tomcat user

ma-impl.sublime-workspace

@@ -275,14 +275,6 @@
 	},
 	"buffers":
 	[
-		{
-			"file": "vipra-ui/app/adapters/application.js",
-			"settings":
-			{
-				"buffer_size": 506,
-				"line_ending": "Unix"
-			}
-		}
 	],
 	"build_system": "",
 	"build_system_choices":
@@ -462,7 +454,6 @@
 	"expanded_folders":
 	[
 		"/home/eike/repos/master/ma-impl",
-		"/home/eike/repos/master/ma-impl/vipra-ui",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/adapters",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/components",
@@ -477,10 +468,14 @@
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/articles",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics",
-		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show"
+		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show",
+		"/home/eike/repos/master/ma-impl/vm"
 	],
 	"file_history":
 	[
+		"/home/eike/repos/master/ma-impl/Vagrantfile",
+		"/home/eike/repos/master/ma-impl/vm/bootstrap.sh",
+		"/home/eike/repos/master/ma-impl/vm/webapps/ROOT/index.html",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/adapters/application.js",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/articles.hbs",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics.hbs",
@@ -516,7 +511,6 @@
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/helpers/topic-numi.js",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/helpers/topicname.js",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/helpers/topic-name.js",
-		"/home/eike/repos/master/ma-impl/vm/bootstrap.sh",
 		"/home/eike/.config/sublime-text-3/Packages/User/Preferences.sublime-settings",
 		"/home/eike/.config/sublime-text-3/Packages/Default/Preferences.sublime-settings",
 		"/home/eike/repos/master/ma-impl/vipra-ui/app/components/dynamic-high-charts.js",
@@ -533,7 +527,6 @@
 		"/home/eike/repos/master/ma-impl/vm/webapps/vipra-rest/WEB-INF/web.xml",
 		"/core",
 		"/home/eike/repos/master/ma-impl/vm/config/environment",
-		"/home/eike/repos/master/ma-impl/Vagrantfile",
 		"/home/eike/repos/master/ma-impl/vm/config/initd-tomcat",
 		"/home/eike/.local/share/vipra/jgibb/jgibb.tassign",
 		"/home/eike/.local/share/vipra/jgibb/jgibb.twords",
@@ -607,8 +600,7 @@
 		"/home/eike/Repositories/fu/ss15/ma/impl/vm/config/spark-env.sh",
 		"/home/eike/Repositories/fu/ss15/ma/impl/vm/rc.sh",
 		"/home/eike/Repositories/fu/ss15/ma/impl/vm/config/rc.local",
-		"/home/eike/Repositories/fu/ss15/ma/impl/vm/env.sh",
-		"/home/eike/Repositories/fu/ss15/ma/impl/ui/backend/pom.xml"
+		"/home/eike/Repositories/fu/ss15/ma/impl/vm/env.sh"
 	],
 	"find":
 	{
@@ -619,6 +611,8 @@
 		"height": 95.0,
 		"where_history":
 		[
+			"/home/eike/repos/master/ma-impl",
+			"/home/eike/repos/master/ma-impl/vipra-ui",
 			"/home/eike/Repositories/finance_app",
 			"/home/eike/Repositories/fiannce_app",
 			"/home/eike/Repositories/startpage_app",
@@ -657,6 +651,7 @@
 		"case_sensitive": false,
 		"find_history":
 		[
+			"de.vipra.cmd.model",
 			"indent",
 			"00:00Z\" },",
 			"{ \"$date\": ",
@@ -783,8 +778,7 @@
 			"logged_in?",
 			"intended",
 			"redirect_intended",
-			"amount-in",
-			"'"
+			"amount-in"
 		],
 		"highlight": true,
 		"in_selection": false,
@@ -930,39 +924,8 @@
 	"groups":
 	[
 		{
-			"selected": 0,
 			"sheets":
 			[
-				{
-					"buffer": 0,
-					"file": "vipra-ui/app/adapters/application.js",
-					"semi_transient": false,
-					"settings":
-					{
-						"buffer_size": 506,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								119,
-								119
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/JavaScriptNext - ES6 Syntax/JavaScriptNext.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0.0,
-						"translation.y": 0.0,
-						"zoom_level": 1.0
-					},
-					"stack_index": 0,
-					"type": "text"
-				}
 			]
 		}
 	],

vm/bootstrap.sh

@@ -14,8 +14,12 @@ apt-get install git gdebi-core openjdk-8-jdk openjdk-8-jre mongodb tomcat8 -y
 # -----------------------------------------------------------------------------
 # setup tomcat
 
-usermod -a -G tomcat8 vagrant
-mv /var/lib/tomcat8/webapps /var/lib/tomcat8/webapps-orig
+# change user
+echo "TOMCAT8_USER=vagrant" >> /etc/default/tomcat8
+echo "TOMCAT8_GROUP=vagrant" >> /etc/default/tomcat8
+chown -R vagrant.vagrant /var/log/tomcat8 /var/cache/tomcat8 /var/lib/tomcat8/conf/*
+
+# webapp directory
 rm -f /vagrant/vm/webapps
 mkdir /vagrant/vm/webapps
 ln -sf /vagrant/vm/webapps /var/lib/tomcat8/webapps