cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [06/50] git commit: updated refs/heads/master to 1290e10
Date Mon, 22 Sep 2014 19:44:05 GMT
CLOUDSTACK-7143: split connection tracking config into its own file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3574dcf5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3574dcf5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3574dcf5

Branch: refs/heads/master
Commit: 3574dcf54357765e6c1e3389b9ae60f95555dcd4
Parents: ed53167
Author: Leo Simons <lsimons@schubergphilis.com>
Authored: Mon Jul 21 11:27:16 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Sep 22 21:31:36 2014 +0200

----------------------------------------------------------------------
 .../systemvmtemplate/configure_conntrack.sh      | 19 +++++++++++++++++++
 .../definitions/systemvmtemplate/definition.rb   |  1 +
 .../definitions/systemvmtemplate/postinstall.sh  | 19 -------------------
 3 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3574dcf5/tools/appliance/definitions/systemvmtemplate/configure_conntrack.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_conntrack.sh b/tools/appliance/definitions/systemvmtemplate/configure_conntrack.sh
new file mode 100644
index 0000000..7fbd33a
--- /dev/null
+++ b/tools/appliance/definitions/systemvmtemplate/configure_conntrack.sh
@@ -0,0 +1,19 @@
+# This is actually a bug in the conntrackd package. The comment in the conf file says stats
logging is off by default but the parameter is set to on.
+# After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking
even if we don't want it to (on non-redundant routers for instance).
+fix_conntrackd() {
+  sed -i '/Stats {/,/}/ s/LogFile on/LogFile off/' /etc/conntrackd/conntrackd.conf
+  rm -f /var/log/conntrackd-stats.log
+}
+
+# Preload these module otherwise the sysctl settings will not be set, and pasive ftp will
not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
+fix_conntrackd
+fix_modules

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3574dcf5/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index a2eb82b..48c656c 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -64,6 +64,7 @@ config = {
         'configure_login.sh',
         'postinstall.sh',
         'configure_acpid.sh',
+        'configure_conntrack.sh',
         'cleanup.sh',
         'configure_networking.sh',
         'zerodisk.sh'

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3574dcf5/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index f2ce1ae..55d658b 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -126,34 +126,15 @@ fix_hostname() {
   sed -i '/127.0.1.1/d' /etc/hosts
 }
 
-# This is actually a bug in the conntrackd package. The comment in the conf file says stats
logging is off by default but the parameter is set to on.
-# After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking
even if we don't want it to (on non-redundant routers for instance).
-fix_conntrackd() {
-  sed -i '/Stats {/,/}/ s/LogFile on/LogFile off/' /etc/conntrackd/conntrackd.conf
-  rm -f /var/log/conntrackd-stats.log
-}
-
 fix_vhdutil() {
   wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O
/bin/vhd-util
   chmod a+x /bin/vhd-util
 }
 
-# Preload these module otherwise the sysctl settings will not be set, and pasive ftp will
not work.
-fix_modules() {
-  cat >> /etc/modules << EOF
-nf_conntrack_ipv4
-nf_conntrack
-nf_conntrack_ftp
-nf_nat_ftp
-EOF
-}
-
 do_fixes() {
   fix_nameserver
   fix_hostname
-  fix_conntrackd
   fix_vhdutil
-  fix_modules
 }
 
 configure_apache2() {


Mime
View raw message