tests

Author: BertrandGouny

CHANGELOG.md

@@ -0,0 +1,2 @@
+## 0.5.0 (release date: 2015-03-03)
+  - New version initial release

image/service/install.sh

@@ -4,9 +4,12 @@
 # Add phpLDAPadmin virtualhosts
 ln -s /osixia/phpldapadmin/apache2/phpldapadmin.conf /etc/apache2/sites-available/phpldapadmin.conf
 ln -s /osixia/phpldapadmin/apache2/phpldapadmin-ssl.conf /etc/apache2/sites-available/phpldapadmin-ssl.conf
+
 cp /osixia/phpldapadmin/config.php /var/www/phpldapadmin_bootstrap/config/config.php
+rm /osixia/phpldapadmin/config.php
 
 cat /osixia/phpldapadmin/php5-fpm/pool.conf >> /etc/php5/fpm/pool.d/www.conf
+rm /osixia/phpldapadmin/php5-fpm/pool.conf
 
 mkdir -p /var/www/tmp
 chown www-data:www-data /var/www/tmp

image/service/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf

@@ -21,10 +21,6 @@
 		#SSLCACertificateFile /osixia/phpldapadmin/apache2/ssl/${SSL_CA_CRT_FILENAME
 
 		<Directory /var/www/phpldapadmin/htdocs >
-			DirectoryIndex index.php
-			Options +FollowSymLinks
-			AllowOverride None
-			
 			Require all granted
 		</Directory>
 

image/service/phpldapadmin/assets/apache2/phpldapadmin.conf

@@ -7,11 +7,7 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	<Directory /var/www/phpldapadmin/htdocs >
-		DirectoryIndex index.php
-		Options +FollowSymLinks
-		AllowOverride None
-		
+	<Directory /var/www/phpldapadmin/htdocs >	
 		Require all granted
 	</Directory>
 

image/service/phpldapadmin/container-start.sh

@@ -126,7 +126,6 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   find /var/www/ -type d -exec chmod 755 {} \;
   find /var/www/ -type f -exec chmod 644 {} \;
   chmod 400 /var/www/phpldapadmin/config/config.php
-  chown www-data:www-data -R /var/www/phpldapadmin/config/config.php
   chown www-data:www-data -R /var/www
 
   touch $FIRST_START_DONE

test/test.bats

@@ -33,7 +33,7 @@ load test_helper
   LDAP_IP=$(get_container_ip_by_cid $LDAP_CID)
 
   # we start the wordpress container and set DB_HOSTS
-  run_image -e LDAP_HOSTS="['$LDAP_IP']"
+  run_image -e LDAP_HOSTS=$LDAP_IP
 
   # wait openldap 
   wait_service_by_cid $LDAP_CID slapd