Merge branch 'stable'

Daniela Feitosa
2 parents 82ae16fc 584d5a3f
Showing 4 changed files with 74 additions and 82 deletions Show diff stats
INSTALL
INSTALL.email
INSTALL.varnish
debian/noosfero.install
@@ -147,48 +147,7 @@ Restart postgresql:
  
 Noosfero needs a functional e-mail setup to work: the local mail system should
 be able to deliver e-mail to the internet, either directly or through an
-external SMTP server.
-
-If you know mail systems well, you just need to make sure thet the local MTA,
-listening on localhost:25, is able to deliver e-mails to the internet. Any mail
-server will do it.
-
-If you are not a mail specialist, we suggest that you use the Postfix mail
-server, since it is easy to configure and very reliable. Just follow the
-instructions below.
-
-To install Postfix:
-
-# apt-get install postfix
-
-During the installation process, you will be asked a few questions. Your answer
-to them will vary in 2 cases:
-
-Case 1: you can send e-mails directly to the internet. This will be the case
-for most commercial private servers. Your answers should be:
-
-  General type of mail configuration: Internet site
-  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
-
-Case 2: you cannot, or don't want to, send e-mail directly to the internet.
-This happens for example if your server is not allowed to make outbound
-connections on port 25, or if you want to concentrate all your outbound mail
-through a single SMTP server. Your answers in this case should be:
-
-  General type of mail configuration: Internet with smarthost
-  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
-  SMTP relay host: smtp.yourprovider.com
-
-Note that smtp.yourprovider.com must allow your server to deliver e-mails
-through it. You should probably ask your servive provider about this.
-
-There is another possibility: if you are installing on a shared server, and
-don't have permission to configure the local MTA, you can instruct Noosfero to
-send e-mails directly through an external server. Please note that this should
-be your last option, since contacting an external SMTP server directly may slow
-down your Noosfero application server. To configure Noosfero to send e-mails
-through an external SMTP server, follow the instructions on
-http://noosfero.org/Development/SMTPMailSending
+external SMTP server. Please check the documentation at the INSTALL.email file.
  
 As noosfero user
 ================
@@ -0,0 +1,43 @@
+= Noosfero email setup
+
+If you know mail systems well, you just need to make sure that the local MTA,
+listening on localhost:25, is able to deliver e-mails to the internet. Any mail
+server will do it. You can stop reading now.
+
+If you are not an email specialist, then follow the instructions below. We
+suggest that you use the Postfix mail server, since it is easy to configure and
+very reliable. Just follow the instructions below.
+
+To install Postfix:
+
+# apt-get install postfix
+
+During the installation process, you will be asked a few questions. Your answer
+to them will vary in 2 cases:
+
+Case 1: you can send e-mails directly to the internet. This will be the case
+for most commercial private servers. Your answers should be:
+
+  General type of mail configuration: Internet site
+  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+
+Case 2: you cannot, or don't want to, send e-mail directly to the internet.
+This happens for example if your server is not allowed to make outbound
+connections on port 25, or if you want to concentrate all your outbound mail
+through a single SMTP server. Your answers in this case should be:
+
+  General type of mail configuration: Internet with smarthost
+  System mail name: the name of your domain, e.g. "mysocialnetwork.com"
+  SMTP relay host: smtp.yourprovider.com
+
+Note that smtp.yourprovider.com must allow your server to deliver e-mails
+through it. You should probably ask your servive provider about this.
+
+There is another possibility: if you are installing on a shared server, and
+don't have permission to configure the local MTA, you can instruct Noosfero to
+send e-mails directly through an external server. Please note that this should
+be your last option, since contacting an external SMTP server directly may slow
+down your Noosfero application server. To configure Noosfero to send e-mails
+through an external SMTP server, follow the instructions on
+http://noosfero.org/Development/SMTPMailSending
+
@@ -5,75 +5,63 @@ recommended. See http://www.varnish-cache.org/ for more information on Varnish.
  
 Varnish can be set up to use with Noosfero with the following steps:
  
-1) setup Noosfero with apache according to the INSTALL file.
+1) setup Noosfero with apache according to the INSTALL file. If you used
+the Debian package to install noosfero, you don't need to do anything
+about this.
  
 2) install Varnish
  
   # apt-get install varnish
  
-Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
-should, unless Debian already released Squeeze by now), make sure you install
-varnish from the lenny-backports suite.
-
 Install the RPAF apache module (or skip this step if not using apache):
  
   # apt-get install libapache2-mod-rpaf
  
-3) Enable varnish logging:
-
-3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
-
-VARNISHNCSA_ENABLED=1
-
-The varnish log will be written to /var/log/varnish/varnishncsa.log in an
-apache-compatible format. You should change your statistics generation software
-(e.g. awstats) to use that instead of apache logs.
-
-3b) Restart Varnish Logging service
-
-  # invoke-rc.d varnishncsa start
-
-4) Change Apache to listen on port 8080 instead of 80
+3) Change Apache to listen on port 8080 instead of 80
  
-4a) Edit /etc/apache2/ports.conf, and:
+3a) Edit /etc/apache2/ports.conf, and:
  
-  * change 'Listen 80' to 'Listen 127.0.0.1:8080'
   * change 'NameVirtualHost *:80' to 'NameVirtualHost *:8080'
+  * change 'Listen 80' to 'Listen 127.0.0.1:8080'
  
-4b) Edit /etc/apache2/sites-enabled/*, and change '<VirtualHost *:80>' to '<VirtualHost *:8080>'
+3b) Edit /etc/apache2/sites-enabled/*, and change '<VirtualHost *:80>' to '<VirtualHost *:8080>'
  
-4c) Restart apache
+3c) Restart apache
  
   # invoke-rc.d apache2 restart
  
-5) Change Varnish to listen on port 80
+4) Varnish configuration
  
-5a) Edit /etc/default/varnish and change '-a :6081' to '-a :80'
+4a) Edit /etc/default/varnish
  
-5b) Restart Varnish
+   * change the line that says "START=no" to say "START=yes"
+   * change '-a :6081' to '-a :80'
  
-  # invoke-rc.d varnish restart
+4b) Edit /etc/varnish/default.vcl and add the following lines at the end:
  
-6) Configure varnish to fit noosfero
-(assuming Noosfero is installed in /var/lib/noosfero)
+  include "/etc/noosfero/varnish-noosfero.vcl";
+  include "/etc/noosfero/varnish-accept-language.vcl";
  
-6a) Configure noosfero to do specific routines to varnish
+On manual installations, change "/etc/noosfero/*" to
+"{Rails.root}/etc/noosfero/*"
  
-Add the following line to your /etc/varnish/default.vcl file:
+4c) Restart Varnish
  
-  include "/var/lib/noosfero/etc/noosfero/varnish-noosfero.vcl";
+  # invoke-rc.d varnish restart
  
-6b) Configure varnish to store separate caches for each language
+5) Enable varnish logging:
  
-Add the following line to your /etc/varnish/default.vcl file:
+5a) Edit /etc/default/varnishncsa and uncomment the line that contains:
  
-  include "/var/lib/noosfero/etc/noosfero/varnish-accept-language.vcl";
+VARNISHNCSA_ENABLED=1
  
-7) Restart Varnish
+The varnish log will be written to /var/log/varnish/varnishncsa.log in an
+apache-compatible format. You should change your statistics generation software
+(e.g. awstats) to use that instead of apache logs.
  
-  # invoke-rc.d varnish restart
+5b) Restart Varnish Logging service
+
+  # invoke-rc.d varnishncsa restart
  
 Thanks to Cosimo Streppone for varnish-accept-language. See
 http://github.com/cosimo/varnish-accept-language for more information.
-
- -- Antonio Terceiro <terceiro@colivre.coop.br>  Sat, 04 Sep 2010 17:29:27 -0300
@@ -32,6 +32,8 @@ debian/solr.yml                   etc/noosfero
 debian/thin.yml                   etc/noosfero
 etc/logrotate.d/noosfero          etc/logrotate.d
 debian/noosfero.yml               etc/noosfero
+etc/noosfero/varnish-accept-language.vcl  etc/noosfero
+etc/noosfero/varnish-noosfero.vcl         etc/noosfero
  
 locale                            usr/share/noosfero
 doc/noosfero                      usr/share/noosfero/doc
...	...	@@ -147,48 +147,7 @@ Restart postgresql:
147	147
148	148	Noosfero needs a functional e-mail setup to work: the local mail system should
149	149	be able to deliver e-mail to the internet, either directly or through an
150		-external SMTP server.
151		-
152		-If you know mail systems well, you just need to make sure thet the local MTA,
153		-listening on localhost:25, is able to deliver e-mails to the internet. Any mail
154		-server will do it.
155		-
156		-If you are not a mail specialist, we suggest that you use the Postfix mail
157		-server, since it is easy to configure and very reliable. Just follow the
158		-instructions below.
159		-
160		-To install Postfix:
161		-
162		-# apt-get install postfix
163		-
164		-During the installation process, you will be asked a few questions. Your answer
165		-to them will vary in 2 cases:
166		-
167		-Case 1: you can send e-mails directly to the internet. This will be the case
168		-for most commercial private servers. Your answers should be:
169		-
170		- General type of mail configuration: Internet site
171		- System mail name: the name of your domain, e.g. "mysocialnetwork.com"
172		-
173		-Case 2: you cannot, or don't want to, send e-mail directly to the internet.
174		-This happens for example if your server is not allowed to make outbound
175		-connections on port 25, or if you want to concentrate all your outbound mail
176		-through a single SMTP server. Your answers in this case should be:
177		-
178		- General type of mail configuration: Internet with smarthost
179		- System mail name: the name of your domain, e.g. "mysocialnetwork.com"
180		- SMTP relay host: smtp.yourprovider.com
181		-
182		-Note that smtp.yourprovider.com must allow your server to deliver e-mails
183		-through it. You should probably ask your servive provider about this.
184		-
185		-There is another possibility: if you are installing on a shared server, and
186		-don't have permission to configure the local MTA, you can instruct Noosfero to
187		-send e-mails directly through an external server. Please note that this should
188		-be your last option, since contacting an external SMTP server directly may slow
189		-down your Noosfero application server. To configure Noosfero to send e-mails
190		-through an external SMTP server, follow the instructions on
191		-http://noosfero.org/Development/SMTPMailSending
	150	+external SMTP server. Please check the documentation at the INSTALL.email file.
192	151
193	152	As noosfero user
194	153	================
...	...
...	...	@@ -0,0 +1,43 @@
	1	+= Noosfero email setup
	2	+
	3	+If you know mail systems well, you just need to make sure that the local MTA,
	4	+listening on localhost:25, is able to deliver e-mails to the internet. Any mail
	5	+server will do it. You can stop reading now.
	6	+
	7	+If you are not an email specialist, then follow the instructions below. We
	8	+suggest that you use the Postfix mail server, since it is easy to configure and
	9	+very reliable. Just follow the instructions below.
	10	+
	11	+To install Postfix:
	12	+
	13	+# apt-get install postfix
	14	+
	15	+During the installation process, you will be asked a few questions. Your answer
	16	+to them will vary in 2 cases:
	17	+
	18	+Case 1: you can send e-mails directly to the internet. This will be the case
	19	+for most commercial private servers. Your answers should be:
	20	+
	21	+ General type of mail configuration: Internet site
	22	+ System mail name: the name of your domain, e.g. "mysocialnetwork.com"
	23	+
	24	+Case 2: you cannot, or don't want to, send e-mail directly to the internet.
	25	+This happens for example if your server is not allowed to make outbound
	26	+connections on port 25, or if you want to concentrate all your outbound mail
	27	+through a single SMTP server. Your answers in this case should be:
	28	+
	29	+ General type of mail configuration: Internet with smarthost
	30	+ System mail name: the name of your domain, e.g. "mysocialnetwork.com"
	31	+ SMTP relay host: smtp.yourprovider.com
	32	+
	33	+Note that smtp.yourprovider.com must allow your server to deliver e-mails
	34	+through it. You should probably ask your servive provider about this.
	35	+
	36	+There is another possibility: if you are installing on a shared server, and
	37	+don't have permission to configure the local MTA, you can instruct Noosfero to
	38	+send e-mails directly through an external server. Please note that this should
	39	+be your last option, since contacting an external SMTP server directly may slow
	40	+down your Noosfero application server. To configure Noosfero to send e-mails
	41	+through an external SMTP server, follow the instructions on
	42	+http://noosfero.org/Development/SMTPMailSending
	43	+
...	...
...	...	@@ -5,75 +5,63 @@ recommended. See http://www.varnish-cache.org/ for more information on Varnish.
5	5
6	6	Varnish can be set up to use with Noosfero with the following steps:
7	7
8		-1) setup Noosfero with apache according to the INSTALL file.
	8	+1) setup Noosfero with apache according to the INSTALL file. If you used
	9	+the Debian package to install noosfero, you don't need to do anything
	10	+about this.
9	11
10	12	2) install Varnish
11	13
12	14	# apt-get install varnish
13	15
14		-Noosfero was tested with Varnish 2.x. If you are using a Debian Lenny (and you
15		-should, unless Debian already released Squeeze by now), make sure you install
16		-varnish from the lenny-backports suite.
17		-
18	16	Install the RPAF apache module (or skip this step if not using apache):
19	17
20	18	# apt-get install libapache2-mod-rpaf
21	19
22		-3) Enable varnish logging:
23		-
24		-3a) Edit /etc/default/varnishncsa and uncomment the line that contains:
25		-
26		-VARNISHNCSA_ENABLED=1
27		-
28		-The varnish log will be written to /var/log/varnish/varnishncsa.log in an
29		-apache-compatible format. You should change your statistics generation software
30		-(e.g. awstats) to use that instead of apache logs.
31		-
32		-3b) Restart Varnish Logging service
33		-
34		- # invoke-rc.d varnishncsa start
35		-
36		-4) Change Apache to listen on port 8080 instead of 80
	20	+3) Change Apache to listen on port 8080 instead of 80
37	21
38		-4a) Edit /etc/apache2/ports.conf, and:
	22	+3a) Edit /etc/apache2/ports.conf, and:
39	23
40		- * change 'Listen 80' to 'Listen 127.0.0.1:8080'
41	24	* change 'NameVirtualHost :80' to 'NameVirtualHost :8080'
	25	+ * change 'Listen 80' to 'Listen 127.0.0.1:8080'
42	26
43		-4b) Edit /etc/apache2/sites-enabled/, and change '<VirtualHost :80>' to '<VirtualHost *:8080>'
	27	+3b) Edit /etc/apache2/sites-enabled/, and change '<VirtualHost :80>' to '<VirtualHost *:8080>'
44	28
45		-4c) Restart apache
	29	+3c) Restart apache
46	30
47	31	# invoke-rc.d apache2 restart
48	32
49		-5) Change Varnish to listen on port 80
	33	+4) Varnish configuration
50	34
51		-5a) Edit /etc/default/varnish and change '-a :6081' to '-a :80'
	35	+4a) Edit /etc/default/varnish
52	36
53		-5b) Restart Varnish
	37	+ * change the line that says "START=no" to say "START=yes"
	38	+ * change '-a :6081' to '-a :80'
54	39
55		- # invoke-rc.d varnish restart
	40	+4b) Edit /etc/varnish/default.vcl and add the following lines at the end:
56	41
57		-6) Configure varnish to fit noosfero
58		-(assuming Noosfero is installed in /var/lib/noosfero)
	42	+ include "/etc/noosfero/varnish-noosfero.vcl";
	43	+ include "/etc/noosfero/varnish-accept-language.vcl";
59	44
60		-6a) Configure noosfero to do specific routines to varnish
	45	+On manual installations, change "/etc/noosfero/*" to
	46	+"{Rails.root}/etc/noosfero/*"
61	47
62		-Add the following line to your /etc/varnish/default.vcl file:
	48	+4c) Restart Varnish
63	49
64		- include "/var/lib/noosfero/etc/noosfero/varnish-noosfero.vcl";
	50	+ # invoke-rc.d varnish restart
65	51
66		-6b) Configure varnish to store separate caches for each language
	52	+5) Enable varnish logging:
67	53
68		-Add the following line to your /etc/varnish/default.vcl file:
	54	+5a) Edit /etc/default/varnishncsa and uncomment the line that contains:
69	55
70		- include "/var/lib/noosfero/etc/noosfero/varnish-accept-language.vcl";
	56	+VARNISHNCSA_ENABLED=1
71	57
72		-7) Restart Varnish
	58	+The varnish log will be written to /var/log/varnish/varnishncsa.log in an
	59	+apache-compatible format. You should change your statistics generation software
	60	+(e.g. awstats) to use that instead of apache logs.
73	61
74		- # invoke-rc.d varnish restart
	62	+5b) Restart Varnish Logging service
	63	+
	64	+ # invoke-rc.d varnishncsa restart
75	65
76	66	Thanks to Cosimo Streppone for varnish-accept-language. See
77	67	http://github.com/cosimo/varnish-accept-language for more information.
78		-
79		- -- Antonio Terceiro <terceiro@colivre.coop.br> Sat, 04 Sep 2010 17:29:27 -0300
...	...
...	...	@@ -32,6 +32,8 @@ debian/solr.yml etc/noosfero
32	32	debian/thin.yml etc/noosfero
33	33	etc/logrotate.d/noosfero etc/logrotate.d
34	34	debian/noosfero.yml etc/noosfero
	35	+etc/noosfero/varnish-accept-language.vcl etc/noosfero
	36	+etc/noosfero/varnish-noosfero.vcl etc/noosfero
35	37
36	38	locale usr/share/noosfero
37	39	doc/noosfero usr/share/noosfero/doc
...	...