diff --git a/pillar/role/wiki.sls b/pillar/role/wiki.sls index 8d16206..754fec6 100644 --- a/pillar/role/wiki.sls +++ b/pillar/role/wiki.sls @@ -17,7 +17,6 @@ mediawiki_1_27: mysql_server: mysql.infra.opensuse.org wikis: # availale options: - # alias: wikimove.opensuse.org # bento_lang: en # dbmysql5: False # only needed for old-en and old-de, defaults to True # dbpass: not_in_salt_yet @@ -29,7 +28,6 @@ mediawiki_1_27: cn: dbpass: not_in_salt_yet cs: - alias: cz.opensuse.org dbpass: not_in_salt_yet de: dbpass: not_in_salt_yet @@ -87,7 +85,6 @@ mediawiki_1_27: zh: dbpass: not_in_salt_yet zh-tw: - alias: zh_tw.opensuse.org bento_lang: zh_TW dbpass: not_in_salt_yet lang: zh_TW diff --git a/salt/profile/wiki/apache.sls b/salt/profile/wiki/apache.sls index 3d53f77..b00cade 100644 --- a/salt/profile/wiki/apache.sls +++ b/salt/profile/wiki/apache.sls @@ -10,7 +10,6 @@ apache2_running: /etc/apache2/vhosts.d/{{ wiki }}.opensuse.org.conf: file.managed: - context: - alias: {{ data.get('alias', '') }} wiki: {{ wiki }} - listen_in: - service: apache2 diff --git a/salt/profile/wiki/files/apache-vhost.conf b/salt/profile/wiki/files/apache-vhost.conf index e4892b1..1f5057f 100644 --- a/salt/profile/wiki/files/apache-vhost.conf +++ b/salt/profile/wiki/files/apache-vhost.conf @@ -1,8 +1,5 @@ ServerName {{ wiki }}.opensuse.org - {% if alias %} - ServerAlias {{ alias }} - {% endif %} UseCanonicalName Off AADefaultHatName vhost_{{ wiki }}wiki