m2config 0.8.0 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/m2config/schema.sql +4 -5
- data/lib/m2config/server.rb +0 -2
- data/lib/m2config/version.rb +1 -1
- data/spec/server_spec.rb +0 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f3c76efc6317bc7fe641bd3c978cff4f78cd30c5
|
|
4
|
+
data.tar.gz: beea61d1cb3737e3bec50ad83ee8e3a79bd7ee00
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d40a5251991dbe74307fefe85635deefe7b78b2b524b1d2d498cc1f7407c27094304020b5f6775217e5fa99341ece612e094938a4cb138b3b86f00ce2efb4c0
|
|
7
|
+
data.tar.gz: 125c81887b1b5d5fad1154bc1d6a80055c35b9a58069f36a0ee4359b22ebc2aa00e49d6b567d1aa53cd92dc4377e9cec58c887c36ce36309c3d25dc1ee5be394
|
data/lib/m2config/schema.sql
CHANGED
|
@@ -30,15 +30,14 @@ CREATE TABLE route (id INTEGER PRIMARY KEY,
|
|
|
30
30
|
target_type TEXT);
|
|
31
31
|
CREATE TABLE server (id INTEGER PRIMARY KEY,
|
|
32
32
|
uuid TEXT,
|
|
33
|
+
default_host TEXT,
|
|
34
|
+
bind_addr TEXT DEFAULT "0.0.0.0",
|
|
35
|
+
port INTEGER,
|
|
36
|
+
chroot TEXT DEFAULT '/var/www',
|
|
33
37
|
access_log TEXT,
|
|
34
38
|
error_log TEXT,
|
|
35
|
-
chroot TEXT DEFAULT '/var/www',
|
|
36
39
|
pid_file TEXT,
|
|
37
40
|
control_port TEXT DEFAULT "",
|
|
38
|
-
default_host TEXT,
|
|
39
|
-
name TEXT DEFAULT '',
|
|
40
|
-
bind_addr TEXT DEFAULT "0.0.0.0",
|
|
41
|
-
port INTEGER,
|
|
42
41
|
use_ssl INTEGER default 0);
|
|
43
42
|
CREATE TABLE setting (id INTEGER PRIMARY KEY, key TEXT, value TEXT);
|
|
44
43
|
CREATE TABLE statistic (id SERIAL,
|
data/lib/m2config/server.rb
CHANGED
|
@@ -6,7 +6,6 @@ module M2Config
|
|
|
6
6
|
CONTROL_PORT = ''
|
|
7
7
|
CHROOT = './'
|
|
8
8
|
DEFAULT_HOST = 'localhost'
|
|
9
|
-
NAME = 'main'
|
|
10
9
|
BIND_ADDR = '0.0.0.0'
|
|
11
10
|
PORT = 6767
|
|
12
11
|
USE_SSL = 0
|
|
@@ -20,7 +19,6 @@ module M2Config
|
|
|
20
19
|
fields[:pid_file] ||= PID_FILE
|
|
21
20
|
fields[:chroot] ||= CHROOT
|
|
22
21
|
fields[:default_host] ||= DEFAULT_HOST
|
|
23
|
-
fields[:name] ||= NAME
|
|
24
22
|
fields[:bind_addr] ||= BIND_ADDR
|
|
25
23
|
fields[:port] ||= PORT
|
|
26
24
|
fields[:use_ssl] ||= USE_SSL
|
data/lib/m2config/version.rb
CHANGED
data/spec/server_spec.rb
CHANGED
|
@@ -15,7 +15,6 @@ describe M2Config::Server do
|
|
|
15
15
|
res[:control_port].should eq(M2Config::Server::CONTROL_PORT)
|
|
16
16
|
res[:chroot].should eq(M2Config::Server::CHROOT)
|
|
17
17
|
res[:default_host].should eq(M2Config::Server::DEFAULT_HOST)
|
|
18
|
-
res[:name].should eq(M2Config::Server::NAME)
|
|
19
18
|
res[:bind_addr].should eq(M2Config::Server::BIND_ADDR)
|
|
20
19
|
res[:port].should eq(M2Config::Server::PORT)
|
|
21
20
|
res[:use_ssl].should eq(M2Config::Server::USE_SSL)
|