Browse Source

Allow pma.conf to be specific to the server

Nathaniel van Diepen 9 years ago
parent
commit
8518eee2b1
3 changed files with 3 additions and 2 deletions
  1. 1 1
      data/etc/apache2/sites-available/pma.conf
  2. 1 0
      data/etc/mysql/conf.d/replication.cnf
  3. 1 1
      install.sh

+ 1 - 1
data/etc/apache2/sites-available/pma.conf

@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-	ServerName pma.omnimaga.org
+	ServerName pma.__SERVER_HOSTNAME__.omnimaga.org
 	DocumentRoot /var/www/phpmyadmin
 	<Directory /var/www/phpmyadmin>
 		Options +ExecCGI +Indexes +FollowSymLinks +MultiViews

+ 1 - 0
data/etc/mysql/conf.d/replication.cnf

@@ -1,3 +1,4 @@
+[mysqld]
 server-id		= __SERVER_ID__
 log_bin			= /var/log/mysql-bin.log
 binlog-do-db	= omnimaga_forums

+ 1 - 1
install.sh

@@ -139,13 +139,13 @@ updatesudo sudoers.d/ircd;
 log "Services";
 sublog "mysqld";
 cp data/etc/mysql/conf.d/replication.cnf /etc/mysql/conf.d/replication.cnf;
-sed -i "s/__SERVER_ID__/$(cat $TMP/replication_id)/" /etc/mysql/conf.d/replication.cnf;
 service mysql reload;
 sublog "apache2";
 a2enmod -q vhost_alias;
 a2enmod -q rewrite;
 site omnimaga;
 site pma;
+sed -i "s/__SERVER_HOSTNAME__/$(cat $TMP/hostname)/" /etc/apache2/sites-available/pma.conf;
 service apache2 reload;
 log "Core";
 sublog "shell";