Commits

Graham Higgins committed d2344a1

Different approach to postfix issue.

  • Participants
  • Parent commits 6f87fb1
  • Branches trunk

Comments (0)

Files changed (2)

silverlining/commands/setup_node.py

 apt-get update -qq
 apt-get -y -q=2 install rsync
 ''')
+    stdout, stderr, returncode = ssh(
+    'root', node, '''
+cat >> /root/config.dat <<EOF
+Name: postfix/mailname
+Template: postfix/mailname
+Value: straylight.bel-epa.com
+Owners: postfix
+Flags: seen
+
+Name: postfix/main_mailer_type
+Template: postfix/main_mailer_type
+Value: Internet site
+Owners: postfix
+Flags: seen
+EOF 
+''')
     if returncode:
         config.logger.fatal(
             "An error occurred (code=%r)"
                         for line in lines
                         if line.strip() and not line.strip().startswith('#'))
     stdout, stderr, returncode = ssh(
-        'root', node, 'apt-get -y -q=2 install $(cat)',
+        'root', node, """DEBCONF_DB_OVERRIDE='File{/root/config.dat} """ + \
+                      """apt-get -y -q=2 install $(cat)""",
         stdin=packages)
     if returncode:
         config.logger.fatal(

silverlining/server-sync-scripts/update-server-script.sh

 ## This is just a piece of configuration I (Ian) like:
 sed -i "s/ -backup/-backup/" /etc/joe/jmacsrc
 
-# Required workarounds for 14362 Ubuntu 9.10 (karmic)
-if [ ! -e /etc/mailname ] ; then
-    touch /etc/mailname
-    /etc/init.d/postfix restart
-fi
-if [ ! -e /etc/default/locale ] ; then
-    touch /etc/default/locale
-    echo LANG="en_US.UTF-8" > /etc/default/locale
-    echo LANGUAGE="en_US:en" >> /etc/default/locale
-fi
-
 ## Make sure there's a secret:
 if [ ! -e /var/lib/silverlining/secret.txt ] ; then
     python -c '