Skip to content

Commit

Permalink
Modify to moztw.org
Browse files Browse the repository at this point in the history
  • Loading branch information
yoyo930021 committed Jun 27, 2018
1 parent 9ed1c06 commit 606154a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ node_js:
- '8'
addons:
hosts:
- moztw.mcuisc.club
- moztw.org
cache:
- apt
- npm
Expand All @@ -19,7 +19,7 @@ before_deploy:
- sudo a2enmod include
- sudo rm -rf /etc/apache2/sites-available/*
- cat ./moztw-apache.conf | sed -e "s,PATH,`pwd`/web,g" | sudo tee /etc/apache2/sites-available/000-default.conf > /dev/null
- echo "ServerName moztw.mcuisc.club" | sudo tee /etc/apache2/conf-available/servername.conf > /dev/null
- echo "ServerName moztw.org" | sudo tee /etc/apache2/conf-available/servername.conf > /dev/null
- sudo a2enconf servername
- sudo a2ensite 000-default
- mkdir web
Expand All @@ -28,11 +28,11 @@ before_deploy:
- sudo chown -R www-data:www-data ~/
- sudo service apache2 restart
- npm run build
- cp CNAME ./dist/moztw.mcuisc.club/
- cp CNAME ./dist/moztw.org/
deploy:
provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
local_dir: dist/moztw.mcuisc.club/
local_dir: dist/moztw.org/
on:
branch: master
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
moztw.mcuisc.club
moztw.org
4 changes: 2 additions & 2 deletions build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var scrape = require('website-scraper');
var options = {
urls: ['http://moztw.mcuisc.club/'],
urls: ['http://moztw.org/'],
directory: './dist/',
urlFilter: (url) => url.startsWith('http://moztw.mcuisc.club'),
urlFilter: (url) => url.startsWith('http://moztw.org'),
filenameGenerator: 'bySiteStructure',
recursive: true
};
Expand Down
2 changes: 1 addition & 1 deletion moztw-apache.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<VirtualHost *:80>
DocumentRoot PATH
ServerName moztw.mcuisc.club
ServerName moztw.org
ServerAdmin admin@localhost
<Directory PATH>
DirectoryIndex index.shtml
Expand Down

0 comments on commit 606154a

Please sign in to comment.