X-Git-Url: https://vcs.fsf.org/?p=eostre.git;a=blobdiff_plain;f=dbd-autobuild%2FMakefile;h=1e5063826af770e60b6e1468710e30ab0da64f22;hp=d31b2d240976c4a9022e577cdaee667e5b0f5947;hb=54b48a56076f1007d558508a0028660536f722bf;hpb=d50e8d4bcfe8b05171ffcc9a6af9ecedfbe9df8d

diff --git a/dbd-autobuild/Makefile b/dbd-autobuild/Makefile
index d31b2d2..1e50638 100644
--- a/dbd-autobuild/Makefile
+++ b/dbd-autobuild/Makefile
@@ -5,6 +5,8 @@ chown-www:
 	chown -R www-data:www-data /var/www
 
 # recipes for installing this thing onto a "real" (non-chroot) system
+# this is enough to get us to a functional Drupal install page
+# to go further, use the install-from-backups recipe
 setup-real-system: probe-files install-pkgs install-drupal do-mysql chown-www
 
 # test that we have /install-{drupal-toolchain,packages}.sh /pkgs /sqldefaults and /do-mysql-sh
@@ -36,28 +38,16 @@ install-from-backups: probe-backup-files install-sqldump install-drupal-sites ch
 
 probe-backup-files:
 	[ -f /sqldump ]
-	[ -f /sites && -d /sites ]
-#	[ -f /boycottsony.org.conf ]
-#	[ -f /dayagainstdrm.org.conf ]
-#	[ -f /rotten-apple.org.conf ]
-#	[ -f /defectivebydesign.org.conf ]
+	[ -d /sites ]
 
 install-sqldump:
 	# source the dump twice - once to create the DB, once to populate it
-	mysql -u root -p -e 'source /sqldump; source /sqldump'
+	mysql -u root -p -e 'source /sqldump; use dbd_drupal; source /sqldump;'
 
 install-drupal-sites:
 	cd /var/www/html
 	cp -r /sites sites
 
-#install-apache-sites-conf:
-#	cp /*.conf /etc/apache2/sites-available/
-#	a2ensite boycottsony.org
-#	a2ensite dayagainstdrm.org
-#	a2ensite rotten-apple.org
-#	a2ensite www.defectivebydesign.org
-#	systemctl reload apache2
-
 # recipes for building a chroot. notice that sql does not cooperate with chroots, due to some funky postinstall hooks and /proc namespaces conflicting
 build-chroot: new-chroot install-pkgs-in-chroot install-drupal-toolchain