Created
September 9, 2017 15:45
-
-
Save marc1706/3020bf4d0d576fba3604af30e07b8f81 to your computer and use it in GitHub Desktop.
Fix website .htdev for local use
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.htdev b/.htdev | |
index 3799b87..dc565db 100644 | |
--- a/.htdev | |
+++ b/.htdev | |
@@ -7,17 +7,17 @@ | |
# Including as mentioned above should work in almost every case. | |
# Include old .htdev | |
-Include /var/www/www.phpbb.com/htdocs/old/.htdev | |
+Include /var/www/website/.htdev | |
#When updating .com, add a line with each IP. Always allow www2 and www3. | |
#RewriteCond %{REMOTE_HOST} !^140\.211\.15\.19 | |
#RewriteCond %{REMOTE_HOST} !^140\.211\.15\.224 | |
-#RewriteRule ^(.*)$ /var/www/www.phpbb.com/htdocs/old/maintenance-launch.php [L] | |
+#RewriteRule ^(.*)$ /var/www/website/maintenance-launch.php [L] | |
# Exists in /old as directory or file and if so serve it | |
-RewriteCond /var/www/www.phpbb.com/htdocs/old%{REQUEST_URI} -f [OR] | |
-RewriteCond /var/www/www.phpbb.com/htdocs/old%{REQUEST_URI} -d | |
-RewriteRule ^(.*)$ /var/www/www.phpbb.com/htdocs/old$1 [L] | |
+RewriteCond /var/www/website%{REQUEST_URI} -f [OR] | |
+RewriteCond /var/www/website%{REQUEST_URI} -d | |
+RewriteRule ^(.*)$ /var/www/website$1 [L] | |
RewriteCond %{REQUEST_URI} ^/customise/db/{0,1}.* [OR] | |
RewriteCond %{REQUEST_URI} ^/showcase/{0,1}.* [OR] | |
@@ -52,7 +52,7 @@ RewriteCond %{REQUEST_URI} ^/blog/{0,1}.* [OR] | |
RewriteCond %{REQUEST_URI} ^/styles/demo/{0,1}.* [OR] | |
RewriteCond %{REQUEST_URI} ^/support/code-changes/{0,1}.* [OR] | |
RewriteCond %{REQUEST_URI} ^/go/{0,1}.* | |
-RewriteRule ^(.*)$ /var/www/www.phpbb.com/htdocs/old$1 [L] | |
+RewriteRule ^(.*)$ /var/www/website$1 [L] | |
# Exists in /symfony/web as directory or file and if so serve it | |
RewriteCond /var/www/www.phpbb.com/htdocs/symfony/web%{REQUEST_URI} -f [OR] | |
@@ -133,12 +133,12 @@ RewriteCond %{REQUEST_URI} !^/member-login.php | |
RewriteCond %{REQUEST_URI} !^/date.php | |
RewriteCond %{REQUEST_FILENAME} !-f | |
RewriteCond %{REQUEST_FILENAME} !-d | |
-RewriteCond %{REQUEST_URI} !^/var/www/www.phpbb.com/htdocs/symfony/web | |
-RewriteRule ^(.*)$ /var/www/www.phpbb.com/htdocs/symfony/web/app.php$1 [L] | |
+RewriteCond %{REQUEST_URI} !^/var/www/phpbb-website/web | |
+RewriteRule ^(.*)$ /var/www/phpbb-website/web/app_dev.php$1 [L] | |
# Hello ErrorDocuments! I guess they could do with prettification by way of title image and header? | |
-ErrorDocument 401 /var/www/www.phpbb.com/htdocs/old/errordocs/401.php | |
-ErrorDocument 403 /var/www/www.phpbb.com/htdocs/old/errordocs/403.php | |
-ErrorDocument 404 /var/www/www.phpbb.com/htdocs/old/errordocs/404.php | |
-ErrorDocument 412 /var/www/www.phpbb.com/htdocs/old/errordocs/412.php | |
-ErrorDocument 500 /var/www/www.phpbb.com/htdocs/old/errordocs/500.php | |
+ErrorDocument 401 /var/www/website/errordocs/401.php | |
+ErrorDocument 403 /var/www/website/errordocs/403.php | |
+ErrorDocument 404 /var/www/website/errordocs/404.php | |
+ErrorDocument 412 /var/www/website/errordocs/412.php | |
+ErrorDocument 500 /var/www/website/errordocs/500.php | |
diff --git a/setup.sh b/setup.sh | |
old mode 100644 | |
new mode 100755 | |
index 6cc2e10..8833ca2 | |
--- a/setup.sh | |
+++ b/setup.sh | |
@@ -5,6 +5,7 @@ set -x | |
alias sf2='php app/console' | |
+ | |
git remote add public [email protected]:phpbb/phpbb-website.git | |
git remote add private [email protected]:phpbb/phpbb-website-private.git | |
git push public master | |
@@ -21,7 +22,7 @@ git fetch public | |
git fetch private | |
git checkout -b master public/master | |
git checkout -b private private/private | |
-git checkout -b private private/www1-stable | |
+git checkout -b www1-stable private/www1-stable | |
git checkout master | |
git push origin master | |
git push private master private www1-stable |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment