ccorg_index_migration.diff

ccorg_index_migration.diff

diff --git pillars/3_HST/index/init.sls pillars/3_HST/index/init.sls
index f99434f..a38d64e 100644
--- pillars/3_HST/index/init.sls
+++ pillars/3_HST/index/init.sls
@@ -27,5 +27,6 @@ states:
   wordpress.apache2: {{ sls }}
   wordpress.index: {{ sls }}
 wordpress:
+  docroot: /var/www/index
   multisite: False
   site_conf: creativecommons_org.conf
diff --git pillars/5_HST__POD/index__stage/init.sls pillars/5_HST__POD/index__stage/init.sls
index 4c91d15..9fa5d87 100644
--- pillars/5_HST__POD/index__stage/init.sls
+++ pillars/5_HST__POD/index__stage/init.sls
@@ -1,6 +1,6 @@
 {% set ID, HST, POD, LOC, POD__LOC, HST__POD = salt.meta.classify() -%}
 {% set ENDPOINT = salt.meta.rds_endpoint() -%}
-{% set WEBNAME = "stage.creativecommons.org" -%}
+{% set WEBNAME = "newstage.creativecommons.org" -%}
 
 
 include:
@@ -21,7 +21,6 @@ wordpress:
   # (also see 5_HST__POD.index__stage.secrets)
   #canonical: https://{{ WEBNAME }}
   db_host: {{ ENDPOINT }}
-  docroot: /var/www/{{ WEBNAME }}
   site: {{ WEBNAME }}
   title: Creative Commons
   wp_debug: False
diff --git states/apache2/files/creativecommons_org.conf states/apache2/files/creativecommons_org.conf
index f0f2fd7..08ddca4 100644
--- states/apache2/files/creativecommons_org.conf
+++ states/apache2/files/creativecommons_org.conf
@@ -154,8 +154,8 @@
     </Directory>
 
     # Enable WordPress migrations
-    Alias /cache-uploads /var/www/stage.creativecommons.org/cache-uploads
-    <Directory /var/www/stage.creativecommons.org/cache-uploads>
+    Alias /cache-uploads {{ DOCROOT }}/cache-uploads
+    <Directory {{ DOCROOT }}/cache-uploads>
         AllowOverride None
         # Options default is FollowSymlinks
         Require local