1. Nate Aune
  2. silverlining

Commits

Ian Bicking  committed 2451656

Updates for using Lucid instead of Karmic: configuration change for PG (especially postgis), Varnish

  • Participants
  • Parent commits 0778d62
  • Branches default

Comments (0)

Files changed (6)

File silverlining/runner.py

View file
  • Ignore whitespace
 
 parser_create.add_argument(
     '--image',
-    default='name *karmic*',
+    default='name *lucid*',
     metavar="IMAGE",
     help='Image to use, can be "id 10", and can contain wildcards like "name *karmic*".  '
     'Default is "name *karmic*" which will select an Ubuntu Karmic image.')

File silverlining/server-sync-scripts/update-from-server.sh

View file
  • Ignore whitespace
 rsync root@$SERVER:/var/www/README.txt www-README.txt
 echo rsync root@$SERVER:/etc/init.d/silverlining-setup silverlining-setup
 rsync root@$SERVER:/etc/init.d/silverlining-setup silverlining-setup
-echo rsync root@$SERVER:/etc/postgresql/8.3/main/pg_hba.conf pg_hba.conf
-rsync root@$SERVER:/etc/postgresql/8.3/main/pg_hba.conf pg_hba.conf
 echo ssh root@$SERVER '"dpkg-query -W" >' dpkg-query.txt
 ssh root@$SERVER "dpkg-query -W" > dpkg-query.txt
 

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

View file
  • Ignore whitespace
 disabled / default-disabled|general_debug|/dev/null|python|
 " > /var/www/appdata.map
 fi
-chown www-mgr:www-mgr /var/www/appdata.map
+touch /var/www/disabledapps.txt
+chown www-mgr:www-mgr /var/www/appdata.map /var/www/disabledapps.txt
 
 ## Now setup Apache.  Ubuntu installs 000-default, which we don't
 ## want, so we delete it, and make sure the necessary modules are

File silversupport/service/postgis-pg_hba.conf

View file
  • Ignore whitespace
 # access to all databases is required during automatic maintenance
 # (custom daily cronjobs, replication, and similar tasks).
 #
-# This is for general access databases:
+
+# This is for general databases access:
 local   all         all                               trust
 
 # Database administrative login by UNIX sockets
-local   all         postgres                          ident sameuser
+local   all         postgres                          ident
 
 # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
 
 # "local" is for Unix domain socket connections only
-local   all         all                               ident sameuser
+local   all         all                               ident
 # IPv4 local connections:
 host    all         all         127.0.0.1/32          md5
 # IPv6 local connections:
 host    all         all         ::1/128               md5
-

File silversupport/service/postgis.py

View file
  • Ignore whitespace
 
 class Service(AbstractService):
 
-    ## Note that PostGIS only works with 8.3, even though 8.4 is the more
-    ## modern version available on Karmic
     packages = [
         'postgis',
-        'postgresql-8.3',
-        'postgresql-8.3-postgis',
+        'postgresql-8.4',
+        'postgresql-8.4-postgis',
         'postgresql-client',
-        'postgresql-client-8.3',
+        'postgresql-client-8.4',
         'postgresql-client-common',
         'postgresql-common',
         'proj',
             self.install_packages()
             shutil.copyfile(os.path.join(os.path.dirname(__file__),
                                          'postgis-pg_hba.conf'),
-                            '/etc/postgresql/8.3/main/pg_hba.conf')
+                            '/etc/postgresql/8.4/main/pg_hba.conf')
             run(['chown', 'postgres:postgres',
-                 '/etc/postgresql/8.3/main/pg_hba.conf'])
-            run(['/etc/init.d/postgresql-8.3', 'restart'])
+                 '/etc/postgresql/8.4/main/pg_hba.conf'])
+            run(['/etc/init.d/postgresql-8.4', 'restart'])
 
         stdout, stderr, returncode = run(
             ['psql', '-U', 'postgres', '--tuples-only'],
             run(['createdb', '-U', 'postgres', 'template_postgis'])
             parts = ['CREATE LANGUAGE plpgsql;\n']
             parts.append("UPDATE pg_database SET datistemplate='true' WHERE datname='template_postgis';")
-            for filename in ['lwpostgis.sql', 'lwpostgis_upgrade.sql',
+            for filename in ['postgis.sql',
                              'spatial_ref_sys.sql']:
                 filename = os.path.join(
-                    '/usr/share/postgresql-8.3-postgis', filename)
+                    '/usr/share/postgresql/8.4/contrib', filename)
                 fp = open(filename)
                 parts.append(fp.read())
                 parts.append('\n;\n')

File silversupport/service/postgresql-pg_hba.conf

View file
  • Ignore whitespace
 # (custom daily cronjobs, replication, and similar tasks).
 #
 
-# This is for general access databases:
+# This is for general databases access:
 local   all         all                               trust
 
 # Database administrative login by UNIX sockets