diff --git a/INSTALL.md b/INSTALL.md index 20be800..f0d70d6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,8 +10,7 @@ vi /etc/hosts apt-get install mongodb=1:2.4.9-1ubuntu2 - apt-get install nodejs git nginx redis-server ntp supervisor - apt-get install python g++ make screen wget zip unzip iftop vim curl htop iptraf nethogs + apt-get install python g++ make nodejs git nginx redis-server ntp supervisor npm install coffee-script -g @@ -36,22 +35,22 @@ vi /etc/nginx/sites-enabled/rpadmin - server { - listen 80 default_server; - listen [::]:80 default_server ipv6only=on; - rewrite ^/(.*)$ http://DOMAIN/#redirect permanent; - } - - server { - listen 80; - - server_name DOMAIN; - - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://unix:/home/rpadmin/rootpanel.sock:/; + server { + listen 80 default_server; + listen [::]:80 default_server ipv6only=on; + rewrite ^/(.*)$ http://rp.rpvhost.net/#redirect permanent; + } + + server { + listen 80; + + server_name rp.rpvhost.net; + + location / { + proxy_set_header X-Real-IP $remote_addr; + proxy_pass http://unix:/home/rpadmin/rootpanel.sock:/; + } } - } useradd -m rpadmin usermod -G rpadmin -a www-data @@ -142,6 +141,7 @@ ### Runtime # Shell + aot-get install screen wget zip unzip iftop vim curl htop iptraf nethogs apt-get install libcurl4-openssl-dev axel unrar-free emacs subversion subversion-tools tmux mercurial postfix # Golang diff --git a/Vagrantfile b/Vagrantfile index 936fec5..9803f99 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,11 +2,11 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| + # based on ubuntu/trusty64 config.vm.box = "jysperm/rootpanel" config.vm.hostname = "rp.rpvhost.net" config.vm.network "private_network", ip: "192.168.33.10" - config.vm.network "public_network", bridge: 'en0: Wi-Fi (AirPort)' config.vm.synced_folder ".", "/vagrant", owner: "rpadmin", group: "rpadmin" diff --git a/sample/core.config.coffee b/sample/core.config.coffee index d6ada43..82ecd09 100644 --- a/sample/core.config.coffee +++ b/sample/core.config.coffee @@ -1,9 +1,9 @@ module.exports = web: - name: 'RootPanel' - url: 'http://rpvhost.net' + t_name: 'plugins.rpvhost.site_name' + url: 'http://rp.rpvhost.net' listen: '/home/rpadmin/rootpanel.sock' - google_analytics_id: 'UA-49193300-2' + google_analytics_id: '' account: cookie_time: 30 * 24 * 3600 * 1000 diff --git a/sample/rpvhost.config.coffee b/sample/rpvhost.config.coffee index 5e9cc14..fac6878 100644 --- a/sample/rpvhost.config.coffee +++ b/sample/rpvhost.config.coffee @@ -1,9 +1,9 @@ module.exports = web: t_name: 'plugins.rpvhost.site_name' - url: 'http://rpvhost.net' + url: 'http://rp.rpvhost.net' listen: '/home/rpadmin/rootpanel.sock' - google_analytics_id: 'UA-49193300-2' + google_analytics_id: '' account: cookie_time: 30 * 24 * 3600 * 1000