added 'delete server' functionality to server

hexparrot · hexparrot · commit 1ef67f8691e2 · 2013-10-17T09:31:40.000-07:00
show base_directory in webui when displaying paths
diff --git a/html/css/custom.css b/html/css/custom.css
@@ -63,4 +63,8 @@ li.accordion-group a, ul.nav, .pointer  {
 .table-hover tbody tr:hover > td,
 .table-hover tbody tr:hover > td{
 	background-color: #ddd !important;
+}
+
+#delete_server label {
+	padding-left: 0;
 }
diff --git a/html/index.html b/html/index.html
@@ -493,6 +493,29 @@ <h4 class="title" data-bind=""><span class="icon icone-bookmark"></span> Ownersh
                             </section>
                         </div>
                         <!--/ END Default Widget -->
+                        <!-- START Default Widget -->
+                        <div id="delete_server" class="span6 widget" data-bind="">
+                            <header>
+                                <h4 class="title" data-bind=""><span class="icon icone-bookmark"></span> Delete Server</h4>
+                            </header>
+                            <section class="body">
+                                <div class="body-inner">
+                                    <div class="controls" id="delete_confirmations">
+                                        <label class="checkbox">
+                                            <input type="checkbox" value="true"> Delete <span data-bind="text: $root.dashboard.base_directory"></span>/servers/<span data-bind="text: $root.server().server_name"></span>
+                                        </label>
+                                        <label class="checkbox">
+                                            <input type="checkbox" value="true"> Delete <span data-bind="text: $root.dashboard.base_directory"></span>/backup/<span data-bind="text: $root.server().server_name"></span>
+                                        </label>
+                                        <label class="checkbox">
+                                            <input type="checkbox" value="true"> Delete <span data-bind="text: $root.dashboard.base_directory"></span>/archive/<span data-bind="text: $root.server().server_name"></span>
+                                        </label>
+                                        <button class="btn btn-warning btn-mini" data-bind="click: $root.delete_server">Delete </button>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                        <!--/ END Default Widget -->
                     </div>
                     <!--/ END Row -->
 
@@ -704,7 +727,7 @@ <h4 class="title">Create Server from an Archive</h4>
                         </header>
                         <section class="body">
                             <div class="body-inner">
-                                <p>The files listed below are those located in the <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="Acceptable archives are .tar, .tar.gz, .tgz, and .zip">/import</strong> directory of your Minecraft data files.</p>
+                                <p>The files listed below are those located in the <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="Acceptable archives are .tar, .tar.gz, .tgz, and .zip"><span data-bind="text: $root.dashboard.base_directory"></span>/import</strong> directory of your Minecraft data files.</p>
                             </div>
                         </section>
                         <table id="table_importable" class="table table-hover" data-bind="">
@@ -792,8 +815,8 @@ <h4>Server Profiles</h4>
                         <section class="body">
                             <div class="body-inner">
                                 <p>Server profiles may be prototyped by any user, but may only be updated by a user with write permissions on <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="chmod g+w profile.config">profile.config</strong>.
-                                <span data-bind="visible: $root.dashboard.whoami() != 'root'">The <strong>root</strong> user may extend these privileges to additional users by assigning <strong>profile.config</strong> to a new group and then adding authorized users to this group.</span>
-                                <span data-bind="visible: $root.dashboard.whoami() == 'root'">You may share this privilege with additional users by assigning <strong>profile.config</strong> to a new group and then adding authorized users to this group.</span></p>
+                                <span data-bind="visible: $root.dashboard.whoami() != 'root'">The <strong>root</strong> user may extend these privileges to additional users by assigning <strong><span data-bind="text: $root.dashboard.base_directory"></span>/profiles/profile.config</strong> to a new group and then adding authorized users to this group.</span>
+                                <span data-bind="visible: $root.dashboard.whoami() == 'root'">You may share this privilege with additional users by assigning <strong><span data-bind="text: $root.dashboard.base_directory"></span>/profiles/profile.config</strong> to a new group and then adding authorized users to this group.</span></p>
                                 Members of this group may update and remove profiles: 
                                 <select id="pc_group" name="pc_group" data-bind="visible: $root.dashboard.whoami() == 'root', options: $root.dashboard.groups, event: { change: $root.change_pc_group }"></select>
                                 <strong data-bind="visible: $root.dashboard.whoami() != 'root', text: $root.dashboard.pc_group"></strong>
diff --git a/html/index_nl.html b/html/index_nl.html
@@ -491,6 +491,29 @@ <h4 class="title" data-bind=""><span class="icon icone-bookmark"></span> Eigenaa
                             </section>
                         </div>
                         <!--/ END Default Widget -->
+                        <!-- START Default Widget -->
+                        <div id="delete_server" class="span6 widget" data-bind="">
+                            <header>
+                                <h4 class="title" data-bind=""><span class="icon icone-bookmark"></span> Delete Server</h4>
+                            </header>
+                            <section class="body">
+                                <div class="body-inner">
+                                    <div class="controls" id="delete_confirmations">
+                                        <label class="checkbox">
+                                            <input type="checkbox" value="true"> Delete <span data-bind="text: $root.dashboard.base_directory"></span>/servers/<span data-bind="text: $root.server().server_name"></span>
+                                        </label>
+                                        <label class="checkbox">
+                                            <input type="checkbox" value="true"> Delete <span data-bind="text: $root.dashboard.base_directory"></span>/backup/<span data-bind="text: $root.server().server_name"></span>
+                                        </label>
+                                        <label class="checkbox">
+                                            <input type="checkbox" value="true"> Delete <span data-bind="text: $root.dashboard.base_directory"></span>/archive/<span data-bind="text: $root.server().server_name"></span>
+                                        </label>
+                                        <button class="btn btn-warning btn-mini" data-bind="click: $root.delete_server">Delete </button>
+                                    </div>
+                                </div>
+                            </section>
+                        </div>
+                        <!--/ END Default Widget -->
                     </div>
                     <!--/ END Row -->
 
@@ -700,7 +723,7 @@ <h4 class="title">Aanmaken Server van een Archiefbestand</h4>
                         </header>
                         <section class="body">
                             <div class="body-inner">
-                                <p>De onderstaande bestanden zijn in de Minecraft data directory <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="Acceptable archives are .tar, .tar.gz, .tgz, and .zip">/import</strong> gevonden.</p>
+                                <p>De onderstaande bestanden zijn in de Minecraft data directory <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="Acceptable archives are .tar, .tar.gz, .tgz, and .zip"><span data-bind="text: $root.dashboard.base_directory"></span>/import</strong> gevonden.</p>
                             </div>
                         </section>
                         <table id="table_importable" class="table table-hover" data-bind="">
@@ -744,7 +767,7 @@ <h4>Server Profielen</h4>
                     <div class="row-fluid">
                         <section class="body">
                             <div class="body-inner">
-                                <p>Server profielen mag door elke gebruiker worden aangemaakt, maar alleen een gebruiker met schrijfrechten kan <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="Gebruikers met schrijfrechten mogen profielen UPDATEN &amp; VERWIJDEREN">profile.config</strong> updaten. Je kunt dit recht met andere gebruikers delen door <strong>profile.config</strong> toe te kennen aan een nieuwe groep en vervolgens geautoriseerde gebruikers aan de groep toe te voegen.</p>
+                                <p>Server profielen mag door elke gebruiker worden aangemaakt, maar alleen een gebruiker met schrijfrechten kan <strong class="text-success" data-placement="top" title="" rel="tooltip" data-original-title="Gebruikers met schrijfrechten mogen profielen UPDATEN &amp; VERWIJDEREN">profile.config</strong> updaten. Je kunt dit recht met andere gebruikers delen door <strong><span data-bind="text: $root.dashboard.base_directory"></span>/profiles/profile.config</strong> toe te kennen aan een nieuwe groep en vervolgens geautoriseerde gebruikers aan de groep toe te voegen.</p>
                             </div>
                         </section>
                     </div>
diff --git a/html/js/scriptin.js b/html/js/scriptin.js
@@ -198,7 +198,8 @@ function webui() {
 		pc_permissions: ko.observable(),
 		pc_group: ko.observable(),
 		git_hash: ko.observable(),
-		stock_profiles: ko.observableArray([])
+		stock_profiles: ko.observableArray([]),
+		base_directory: ko.observable()
 	}
 
 	self.logs = {
@@ -417,6 +418,30 @@ function webui() {
 								  .then(function() {self.ajax.refresh(null)});
 	}
 
+	self.delete_server = function(vm, eventobj) {
+		var params = {
+			server_name: self.server().server_name
+		}
+
+		var unchecked = $('#delete_confirmations input[type=checkbox]').filter(function(i,v) {
+			return !$(v).prop('checked');
+		})
+
+		if (unchecked.length == 0) {
+			$.getJSON('/delete_server', params)
+			.then(self.ajax.received, self.ajax.lost)
+			.done(function(){ self.show_page('dashboard') },
+				  function(){})
+		} else {
+			$.gritter.add({
+				text: 'No action taken; must confirm all content will be deleted to continue.',
+				sticky: false,
+				time: '3000',
+				class_name: 'gritter-warning'
+			});
+		}	
+	}
+
 	self.change_group = function(vm, eventobj) {
 		var params = {
 			group: $(eventobj.currentTarget).val(),
@@ -480,6 +505,13 @@ function webui() {
 				$.getJSON('/vm/increments', params).then(self.refresh.increments);
 				$.getJSON('/vm/archives', params).then(self.refresh.archives);
 				$.getJSON('/vm/server_summary', params).then(self.refresh.summary);
+				setTimeout(function() {
+					$('#delete_server input[type="checkbox"]').not('.nostyle').iCheck({
+			            checkboxClass: 'icheckbox_minimal-grey',
+			            radioClass: 'iradio_minimal-grey',
+			            increaseArea: '40%' // optional
+			        });
+				}, 500)
 				break;
 			case 'profiles':
 				$.getJSON('/vm/profiles').then(self.refresh.profiles);
@@ -709,6 +741,7 @@ function webui() {
 			self.dashboard.pc_group(data.pc_group);
 			self.dashboard.git_hash(data.git_hash);
 			self.dashboard.stock_profiles(data.stock_profiles);
+			self.dashboard.base_directory(data.base_directory);
 
 			$('#pc_group option').filter(function () { 
 				return $(this).val() == data.pc_group
diff --git a/mineos.py b/mineos.py
@@ -129,8 +129,7 @@ def _set_environment(self):
             'sc': os.path.join(self.env['cwd'], 'server.config'),
             'pc': os.path.join(self.base, self.DEFAULT_PATHS['profiles'], 'profile.config'),
             'sp_backup': os.path.join(self.env['bwd'], 'server.properties'),
-            'sc_backup': os.path.join(self.env['bwd'], 'server.config'),
-            'log': os.path.join(self.env['cwd'], 'server.log')
+            'sc_backup': os.path.join(self.env['bwd'], 'server.config')
             })
 
     def _load_config(self, load_backup=False, generate_missing=False):
@@ -430,6 +429,12 @@ def prune_archives(self, filename):
         """Removes old archives by filename as a space-separated string."""
         self._command_direct(self.command_delete_files(filename), self.env['awd'])
 
+    @server_exists(True)
+    @server_up(False)
+    def delete_server(self):
+        """Deletes server files from system"""
+        self._command_direct(self.command_delete_server, self.env['pwd'])
+
     def remove_profile(self, profile):
         """Removes a profile found in profile.config at the base_directory root"""
         try:
@@ -1069,6 +1074,19 @@ def command_delete_files(self, files):
         self._previous_arguments = required_arguments
         return 'rm -- %(files)s' % required_arguments
 
+    @property
+    @sanitize
+    def command_delete_server(self):
+        """Deletes a server and all its related files and folders"""
+        required_arguments = {
+            'live': self.env['cwd'],
+            'backup': self.env['bwd'],
+            'archive': self.env['awd']
+            }
+
+        self._previous_arguments = required_arguments
+        return 'rm -rf -- %(live)s %(backup)s %(archive)s' % required_arguments
+
     @sanitize
     def command_chown(self, user, path):
         """Executes chown on a directory"""
@@ -1225,9 +1243,16 @@ def find_base(directory, match_dir):
     def list_last_loglines(self, lines=100):
         """Returns last n lines from logfile"""
         from procfs_reader import tail
-        
-        with open(self.env['log'], 'rb') as log:
-            return tail(log, int(lines))
+
+        logfiles =['server.log', os.path.join('logs', 'latest.log')]
+
+        for i in logfiles:
+            try:
+                with open(os.path.join(self.env['cwd'], logfiles), 'rb') as log:
+                    return tail(log, int(lines))
+            except IOError:
+                pass
+        return []
 
     @classmethod
     def list_servers_to_act(cls, action, base_directory):
diff --git a/mounts.py b/mounts.py
@@ -188,7 +188,8 @@ def dashboard(self):
             'pc_permissions': profile_editable,
             'pc_group': pc_group,
             'git_hash': git_hash(os.path.dirname(os.path.abspath(__file__))),
-            'stock_profiles': STOCK_PROFILES.keys()
+            'stock_profiles': STOCK_PROFILES.keys(),
+            'base_directory': self.base_directory,
             })
 
     @cherrypy.expose
@@ -575,4 +576,38 @@ def change_pc_group(self, **raw_args):
 
         response['payload'] = to_jsonable_type(retval)
         return dumps(response)  
-      
+
+    @cherrypy.expose
+    @require()
+    def delete_server(self, **raw_args):
+        args = {k:str(v) for k,v in raw_args.iteritems()}
+        server_name = args.pop('server_name')
+        retval = None
+
+        response = {
+            'result': None,
+            'cmd': 'delete_server',
+            'payload': None
+            }
+
+        try:
+            if mc.has_server_rights(self.login, server_name, self.base_directory):
+                instance = mc(server_name, None, self.base_directory)
+                instance.delete_server()
+            else:
+                raise OSError('Server deletion failed. Only the server owner or root may delete servers.')
+        except (RuntimeError, KeyError, OSError) as ex:
+            response['result'] = 'error'
+            retval = ex.message
+        except CalledProcessError as ex:
+            response['result'] = 'error'
+            retval = ex.output
+        except RuntimeWarning as ex:
+            response['result'] = 'warning'
+            retval = ex.message
+        else:
+            response['result'] = 'success'
+            retval = "Server '%s' deleted" % server_name
+
+        response['payload'] = to_jsonable_type(retval)
+        return dumps(response)        

Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,8 @@ li.accordion-group a, ul.nav, .pointer {`
`63`	`63`	`.table-hover tbody tr:hover > td,`
`64`	`64`	`.table-hover tbody tr:hover > td{`
`65`	`65`	`background-color: #ddd !important;`
	`66`	`+}`
	`67`	`+`
	`68`	`+#delete_server label {`
	`69`	`+ padding-left: 0;`
`66`	`70`	`}`