Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various bugfixes : #113

Merged
merged 4 commits into from
Sep 3, 2015
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/application/config.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $configuration['bdd']['hote']='127.0.0.1';
$configuration['bdd']['base']='afup_dev';
$configuration['bdd']['utilisateur']='afup_dev';
$configuration['bdd']['mot_de_passe']='p455w0rd';
$configuration['web']['path']='http://www.local.afup.org/';
$configuration['web']['path']='http:/afup.dev/';

$configuration['divers']['niveau_erreur']='6143';
$configuration['divers']['afficher_erreurs']='1';
Expand Down
59 changes: 59 additions & 0 deletions provisionning/chef/cookbooks/afup/files/default/config.php.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php
$configuration['bdd']['hote']='127.0.0.1';
$configuration['bdd']['base']='afup_dev';
$configuration['bdd']['utilisateur']='afup_dev';
$configuration['bdd']['mot_de_passe']='p455w0rd';
$configuration['web']['path']='http:/afup.dev/';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http:// :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quel oeil!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code review quoi :p


$configuration['divers']['niveau_erreur']='6143';
$configuration['divers']['afficher_erreurs']='1';
$configuration['mails']['serveur_smtp']='';
$configuration['mails']['email_expediteur']='[email protected]';
$configuration['mails']['nom_expediteur']='Bureau AFUP';
$configuration['mails']['force_destinataire']='';
$configuration['mails']['bcc']='';
$configuration['mails']['tls']='0';
$configuration['mails']['port']='';
$configuration['mails']['username']='';
$configuration['mails']['password']='';
$configuration['afup']['raison_sociale']='AFUP';
$configuration['afup']['adresse']='32, Boulevard de Strasbourg
CS 30108';
$configuration['afup']['code_postal']='75468';
$configuration['afup']['ville']='Paris Cedex 10';
$configuration['afup']['email']='[email protected]';
$configuration['afup']['siret']='500 869 011 00014';
$configuration['rib']['etablissement']='17515';
$configuration['rib']['guichet']='90000';
$configuration['rib']['compte']='04045168667';
$configuration['rib']['cle']='70';
$configuration['rib']['domiciliation']='CE ILE DE FRANCE PARIS';
$configuration['rib']['bic']='CEPAFRPP751';
$configuration['rib']['iban']='FR76 1751 5900 0004 0451 6866 770';
$configuration['bureau']['0']='XavierLacot';
$configuration['bureau']['1']='AurelienVairet';
$configuration['bureau']['2']='mikaelkael';
$configuration['bureau']['3']='OlivierMansour';
$configuration['bureau']['4']='msupiot';
$configuration['bureau']['5']='jeanfrancois';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je pense que ça tu peux changer aussi !

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

la je ne sais pas ce qu'il faut mettre à la place

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je ne sais même pas où c'est utilisé…

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

En bas des PDF générés par ex.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pour la partie "bureau" c'est du côté des votes de conférences (de mémoire)

//$configuration['bureau']['6']='SarahHaimLubczanski';

$configuration['paybox_prod']['site']='8316677';
$configuration['paybox_prod']['rang']='01';
$configuration['paybox_test']['site']='1999888';
$configuration['paybox_test']['rang']='99';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WHAT ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Le mot de passe n'y est pas, c'est le principal :)

Mais effectivement on peut supprimer (= vider) (même si c'est dans l'historique).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok je m'en charge 👍

$configuration['paybox']['site']='8316677';
$configuration['paybox']['rang']='01';
$configuration['planete']['pertinence']='php|afup|pear|pecl|symfony|copix|jelix|wampserver|simpletest|simplexml|zend|pmo|drupal|ovidentia|mvc|magento|chrome|spip|PDO|mock|cake|hiphop|CMS|Framework|typo3|photon|pattern';
$configuration['site']['prefix']='pages/site/';
$configuration['site']['query_prefix']='?route=';
$configuration['git']['local_repo']='/home/afup/git.afup.org';
$configuration['git']['local_export']='/home/afup/afup.org/';
$configuration['sympa']['hote']='localhost';
$configuration['sympa']['base']='sympa';
$configuration['sympa']['utilisateur']='sympa';
$configuration['sympa']['mot_de_passe']='sympa';

$configuration['mandrill']['key'] = '';
$configuration['mandrill']['bcc'] = '[email protected]';

4 changes: 2 additions & 2 deletions provisionning/chef/cookbooks/afup/files/default/mariadb.list
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MariaDB 10.0 repository list - created 2015-05-09 13:20 UTC
# http://mariadb.org/mariadb/repositories/
deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.0/debian wheezy main
deb-src http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.0/debian wheezy main
deb http://mirror6.layerjet.com/mariadb/repo/10.0/debian wheezy main
deb-src http://mirror6.layerjet.com/mariadb/repo/10.0/debian wheezy main
13 changes: 13 additions & 0 deletions provisionning/chef/cookbooks/afup/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,19 @@
end
execute "update-rc.d mailcatcher defaults"


# Smarty Cache
# -----------
execute "mkdir -p /var/www/afup/htdocs/cache/templates && chmod 0777 /var/www/afup/htdocs/cache/templates"

# Creating default config file
# -----------
cookbook_file "config.php.dist" do
path "/var/www/afup/configs/application/config.php"
action :create_if_missing
mode "0755"
end

# Restart services
# ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
service "mysql" do
Expand Down