Skip to content

Commit

Permalink
Merge branch 'deb' into 'master'
Browse files Browse the repository at this point in the history
Deb

See merge request xcjs/blur-monitor!10
  • Loading branch information
xcjs committed Oct 19, 2018
2 parents 392d2cf + aede694 commit 3ea6de4
Show file tree
Hide file tree
Showing 72 changed files with 7,244 additions and 4,298 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,13 @@ build
/bower_components

*.log

/bin/blur-monitor
/bin/*.node
/bin/*.tar.gz

/installers/**/opt/blur-monitor/blur-monitor
/installers/**/*.node
/installers/*.deb

/.vagrant/
66 changes: 55 additions & 11 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,57 @@
build:
stages:
- Build

ubuntu-16.04_amd64:
stage: Build
tags:
- linux
- nodejs
- bower
- dnsutils
- ifstat
- traceroute
- libpam0g-dev
- vagrant
- virtualbox
- x86_64
before_script:
- vagrant plugin install vagrant-vbguest
- vagrant box update
script:
- npm install
- bower install
- gulp build
- vagrant up xenial64
after_script:
- vagrant destroy --force xenial64
artifacts:
paths:
- installers/blur-monitor_ubuntu-16.04_amd64.deb
expire_in: 1 week

ubuntu-18.04_amd64:
stage: Build
tags:
- vagrant
- virtualbox
- x86_64
before_script:
- vagrant plugin install vagrant-vbguest
- vagrant box update
script:
- vagrant up bionic64
after_script:
- vagrant destroy --force bionic64
artifacts:
paths:
- bin/blur-monitor_linux_amd64.tar.gz
- installers/blur-monitor_ubuntu-18.04_amd64.deb
expire_in: 1 week

debian-9_amd64:
stage: Build
tags:
- vagrant
- virtualbox
- x86_64
before_script:
- vagrant plugin install vagrant-vbguest
- vagrant box update
script:
- vagrant up stretch64
after_script:
- vagrant destroy --force stretch64
artifacts:
paths:
- installers/blur-monitor_debian-9_amd64.deb
expire_in: 1 week
File renamed without changes.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Currently the tool can be used to monitor the following information:
node ./blurmonitor
```

The server will launch on port 3000 by default, or you can reference the command line flags.
The server will launch on port 3201 by default, or you can reference the command line flags.

A proxy server through Apache or NGINX is recommended for production environments.

Expand All @@ -98,15 +98,15 @@ Sample Apache configuration:
SetEnv no-gzip 1
ProxyRequests On
ProxyPass / http://127.0.0.1:3000/
ProxyPass / http://127.0.0.1:3201/
</VirtualHost>
```

## Command Line Flags

### Port (-p)
```bash
node ./blurmonitor -p 3000
node ./blurmonitor -p 3201
```

### Environment (-e)
Expand Down
109 changes: 109 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# All Vagrant configuration is done below. The "2" in Vagrant.configure
# configures the configuration version (we support older styles for
# backwards compatibility). Please don't change it unless you know what
# you're doing.
Vagrant.configure("2") do |config|
config.vm.define "xenial64" do |xenial64|
xenial64.vm.box = "ubuntu/xenial64"
xenial64.vm.hostname = "xenial64"
xenial64.vm.network "forwarded_port", guest: 3201, host: 3202
xenial64.vm.synced_folder "./", "/vagrant", type: "virtualbox"
xenial64.vm.provider "virtualbox"

xenial64.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo apt-get -qq update
sudo apt-get -qq full-upgrade
sudo apt-get -qq autoremove
sudo apt-get -qq install git curl python build-essential libpam0g-dev gdebi-core
curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
sudo apt-get -qq install nodejs
sudo npm install -g npm
cd /vagrant
npm install
npm rebuild
npm run installer:ubuntu-16.04_amd64
sudo gdebi --non-interactive installers/blur-monitor_ubuntu-16.04_amd64.deb
sleep 10
sudo netstat -tulpn | grep 3201
SHELL
end

config.vm.define "bionic64" do |bionic64|
bionic64.vm.box = "ubuntu/bionic64"
bionic64.vm.hostname = "bionic64"
bionic64.vm.network "forwarded_port", guest: 3201, host: 3202
bionic64.vm.synced_folder "./", "/vagrant", type: "virtualbox"
bionic64.vm.provider "virtualbox"

bionic64.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo apt-get -qq update
sudo apt-get -qq full-upgrade
sudo apt-get -qq autoremove
sudo apt-get -qq install git curl python build-essential libpam0g-dev gdebi-core
curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
sudo apt-get -qq install nodejs
sudo npm install -g npm
cd /vagrant
npm install
npm rebuild
npm run build:tarball
npm run installer:ubuntu-18.04_amd64
sudo gdebi --non-interactive installers/blur-monitor_ubuntu-18.04_amd64.deb
sleep 10
sudo netstat -tulpn | grep 3201
SHELL
end

config.vm.define "stretch64" do |stretch64|
stretch64.vm.box = "debian/stretch64"
stretch64.vm.hostname = "stretch64"
stretch64.vm.network "forwarded_port", guest: 3201, host: 3202
stretch64.vm.synced_folder "./", "/vagrant", type: "virtualbox"
stretch64.vm.provider "virtualbox"

stretch64.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo apt-get -qq update
sudo apt-get -qq full-upgrade
sudo apt-get -qq autoremove
sudo apt-get -qq install git curl python build-essential libpam0g-dev gdebi-core net-tools
curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
sudo apt-get -qq install nodejs
sudo npm install -g npm
cd /vagrant
npm install
npm rebuild
npm run installer:debian-9_amd64
sudo gdebi --non-interactive installers/blur-monitor_debian-9_amd64.deb
sleep 10
sudo netstat -tulpn | grep 3201
SHELL
end

end
Empty file added bin/.gitkeep
Empty file.
73 changes: 0 additions & 73 deletions blurmonitor/index.js

This file was deleted.

11 changes: 0 additions & 11 deletions changelog-blur-admin.md

This file was deleted.

31 changes: 0 additions & 31 deletions docs/config.json

This file was deleted.

43 changes: 0 additions & 43 deletions docs/contents/articles/001-getting-started/index.md

This file was deleted.

Loading

0 comments on commit 3ea6de4

Please sign in to comment.