Merge Request #6
← To merge requests
From
replace_thin_by_unicorn
into
master
Commits (1)
-
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Showing
1 changed file
Show diff stats
noosfero/noosfero.spec
@@ -49,7 +49,7 @@ cp etc/init.d/noosfero %{buildroot}/etc/init.d/ | @@ -49,7 +49,7 @@ cp etc/init.d/noosfero %{buildroot}/etc/init.d/ | ||
49 | 49 | ||
50 | mkdir -p %{buildroot}/etc/noosfero/plugins | 50 | mkdir -p %{buildroot}/etc/noosfero/plugins |
51 | ln -sf /etc/noosfero/database.yml %{buildroot}/usr/lib/noosfero/config/database.yml | 51 | ln -sf /etc/noosfero/database.yml %{buildroot}/usr/lib/noosfero/config/database.yml |
52 | -ln -sf /etc/noosfero/thin.yml %{buildroot}/usr/lib/noosfero/config/thin.yml | 52 | +ln -sf /etc/noosfero/unicorn.rb %{buildroot}/usr/lib/noosfero/config/unicorn.rb |
53 | 53 | ||
54 | mkdir -p %{buildroot}/etc/noosfero/plugins | 54 | mkdir -p %{buildroot}/etc/noosfero/plugins |
55 | cp config/plugins/README %{buildroot}/etc/noosfero/plugins | 55 | cp config/plugins/README %{buildroot}/etc/noosfero/plugins |
@@ -71,20 +71,10 @@ ln -sfT noosfero %{buildroot}/usr/lib/noosfero/public/designs/themes/default | @@ -71,20 +71,10 @@ ln -sfT noosfero %{buildroot}/usr/lib/noosfero/public/designs/themes/default | ||
71 | ln -sfT tango %{buildroot}/usr/lib/noosfero/public/designs/icons/default | 71 | ln -sfT tango %{buildroot}/usr/lib/noosfero/public/designs/icons/default |
72 | 72 | ||
73 | 73 | ||
74 | -cat > %{buildroot}/etc/noosfero/thin.yml <<EOF | ||
75 | ---- | ||
76 | -chdir: /usr/lib/noosfero | ||
77 | -environment: production | ||
78 | -address: 0.0.0.0 | ||
79 | -port: 3000 | ||
80 | -timeout: 30 | ||
81 | -log: log/thin.log | ||
82 | -pid: tmp/pids/thin.pid | ||
83 | -max_conns: 1024 | ||
84 | -max_persistent_conns: 512 | ||
85 | -require: [] | ||
86 | -wait: 30 | ||
87 | -daemonize: true | 74 | +cat > %{buildroot}/etc/noosfero/unicorn.rb <<EOF |
75 | +listen "127.0.0.1:3000" | ||
76 | + | ||
77 | +worker_processes `nproc`.to_i | ||
88 | EOF | 78 | EOF |
89 | 79 | ||
90 | cat > %{buildroot}/etc/noosfero/database.yml <<EOF | 80 | cat > %{buildroot}/etc/noosfero/database.yml <<EOF |
@@ -158,5 +148,5 @@ chkconfig --del noosfero | @@ -158,5 +148,5 @@ chkconfig --del noosfero | ||
158 | /etc/noosfero/plugins/README | 148 | /etc/noosfero/plugins/README |
159 | %config(noreplace) /etc/default/noosfero | 149 | %config(noreplace) /etc/default/noosfero |
160 | %config(noreplace) /etc/noosfero/database.yml | 150 | %config(noreplace) /etc/noosfero/database.yml |
161 | -%config(noreplace) /etc/noosfero/thin.yml | 151 | +%config(noreplace) /etc/noosfero/unicorn.rb |
162 | %doc | 152 | %doc |