From 17c3a03ec3a946049ec6d2cc259d235c93259be9 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 27 Mar 2014 16:39:44 +0000
Subject: [PATCH] Shoot lxc stopexpired

---
 .gitattributes          |  1 -
 debian/alternc.cron.d   |  2 --
 src/lxc_stopexpired.php | 40 ----------------------------------------
 3 files changed, 43 deletions(-)
 delete mode 100755 src/lxc_stopexpired.php

diff --git a/.gitattributes b/.gitattributes
index 5cdc900d..2e6b2634 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -653,7 +653,6 @@ src/generate_apache_conf.php -text
 src/generate_bind_conf.php -text
 src/inotify_do_actions.sh -text
 src/inotify_update_domains.sh -text
-src/lxc_stopexpired.php -text
 src/mail_dodelete.php -text
 src/mem_add -text
 src/mem_del -text
diff --git a/debian/alternc.cron.d b/debian/alternc.cron.d
index e6ce2f96..93c9614e 100644
--- a/debian/alternc.cron.d
+++ b/debian/alternc.cron.d
@@ -34,5 +34,3 @@
 # Every 20 minutes, do actions
 00,20 * * * *	root	/usr/lib/alternc/do_actions.php
 
-# Every hour, stop expired VMs
-10 * * * *	alterncpanel	/usr/lib/alternc/lxc_stopexpired.php
diff --git a/src/lxc_stopexpired.php b/src/lxc_stopexpired.php
deleted file mode 100755
index 195ab504..00000000
--- a/src/lxc_stopexpired.php
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/php -q
-<?php
-/*
-   $Id: do_actions.php,v 1.0 2013/04/19 13:40:32 axel Exp $
-   ----------------------------------------------------------------------
-   AlternC - Web Hosting System
-   Copyright (C) 2002 by the AlternC Development Team.
-   http://alternc.org/
-   ----------------------------------------------------------------------
-   Based on:
-   Valentin Lacambre's web hosting softwares: http://altern.org/
-   ----------------------------------------------------------------------
-   LICENSE
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License (GPL)
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   To read the license please visit http://www.gnu.org/copyleft/gpl.html
-   ----------------------------------------------------------------------
-   Original Author of file: Alan Garcia
-   Purpose of file: Shutdown expired VMs
-   ----------------------------------------------------------------------
- */
-require_once("/usr/share/alternc/panel/class/config_nochk.php");
-
-$admin->stop_if_jobs_locked();
-
-# Be super user
-#$mem->setid(2000);
-$admin->enabled=1;
-
-# Stop expired vms
-$lxc->stop_expired();