dont mess with config file

4 years ago · 5f6c97d146
3 changed files with 18 additions and 25 deletions
--- a/7
+++ b/7
@ -6,8 +6,11 @@ ENV?="dev"
 #To compile project with plugins, add PLUGINS=1 or type `export PLUGINS=1`
 install:
 	#copy config file from template
 	cp config.xml.dist config.xml	
 	#copy config file from template first time only
 	@if [ ! -f config.xml ]; then \
 	cp config.xml.dist config.xml; \
 	fi
 	@if [ $(ENV) = "dev" ]; then \
 	make install_dev; \
 	fi
--- a/config.xml.dist
+++ b/config.xml.dist
@ -1,29 +1,19 @@
 <config
 	lang="fr"
 	langs="fr"
  	langnames="Français"
 	host="www.amapeisudreunion.com"
 	name = "AMAPEI Sud Réunion"
 	default_email = "admin@amapeisudreunion.com"
 	webmaster_email = "postmaster@amapeisudreunion.com"
 	database="mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
 	host="<URL without http>"
 	name = "<HTML head title>"
 	default_email = "<default email>"
 	database="mysql://cagette:cagette@ct1/cagette"
 	sqllog="0"
 	key="carotteMagique"
 	debug="0"
 	cache="1"
 	maintain="0"
 	cache="1"
 	cachetpl="0"
 	key="carotteMagique"
 	smtp_host="localhost"
 	smtp_port="25"
 	smtp_user=""
 	smtp_pass=""
 	mt.net.form.Form.HTML5 = "1"
 	mt.net.form.Form.USE_TWITTER_BOOTSTRAP = "1"
 	debug="0"
 	sqllog="0"
 	google_geocoding_key="googlekey"
 	lang="fr"
 	langs="fr"
  	langnames="Français"
 />
--- a/lang/master/tpl/mail/design.mtt
+++ b/lang/master/tpl/mail/design.mtt
@ -17,7 +17,7 @@ table.table td{
 <hr/>
 <div style="color:#666;font-size:12px;">
 	::_("This e-mail was sent from"):: <a href="http://::HOST::">::_("Cagette.net")::</a>.
 	::_("This e-mail was sent from"):: <a href="http://::HOST::">::group.name::</a>.
 	::if group!=null::
 		<br/>
@ -37,4 +37,4 @@ table.table td{
 	</div>
 	::end::
 </div>
 </div>