veizour 6 лет назад
Родитель
Сommit
99375e5871
1 измененных файлов с 40 добавлено и 40 удалено
  1. 40 40
      Dockerfile

+ 40 - 40
Dockerfile

@@ -49,8 +49,8 @@ RUN \
   rm /etc/apache2/sites-available/* && \
   rm /etc/apache2/apache2.conf && \
   ln -s /config/proxy-config.conf /etc/apache2/sites-available/000-default.conf && \
-  ln -s /config/ossn.config.site /var/www/html/ossn/configurations/ossn.config.site && \
-  ln -s /config/ossn.config.db /var/www/html/ossn/configurations/ossn.config.db && \
+  ln -s /config/ossn.config.site.php /var/www/html/ossn/configurations/ossn.config.site.php && \
+  ln -s /config/ossn.config.db.php /var/www/html/ossn/configurations/ossn.config.db.php && \
   ln -s /var/log/apache2 /logs
 
 # Update apache configuration with this one
@@ -72,46 +72,46 @@ echo "" >> /etc/apache2/000-default.conf && \
 echo "</VirtualHost>" >> /etc/apache2/000-default.conf
 
 RUN \
-echo "<?php" > /etc/apache2/ossn.config.site && \
-echo "/**" >> /etc/apache2/ossn.config.site && \
-echo " * Open Source Social Network" >> /etc/apache2/ossn.config.site && \
-echo " *" >> /etc/apache2/ossn.config.site && \
-echo " * @package   (softlab24.com).ossn" >> /etc/apache2/ossn.config.site && \
-echo " * @author    OSSN Core Team <info@softlab24.com>" >> /etc/apache2/ossn.config.site && \
-echo " * @copyright (C) SOFTLAB24 LIMITED" >> /etc/apache2/ossn.config.site && \
-echo " * @license   Open Source Social Network License (OSSN LICENSE)  http://www.opensource-socialnetwork.org/licence" >> /etc/apache2/ossn.config.site && \
-echo " * @link      https://www.opensource-socialnetwork.org/" >> /etc/apache2/ossn.config.site && \
-echo " */" >> /etc/apache2/ossn.config.site && \
-echo "" >> /etc/apache2/ossn.config.site && \
-echo "$Ossn->url = '$servername';" >> /etc/apache2/ossn.config.site && \
-echo "$Ossn->userdata = '$DataDirectory';" >> /etc/apache2/ossn.config.site
+echo "<?php" > /etc/apache2/ossn.config.site.php && \
+echo "/**" >> /etc/apache2/ossn.config.site.php && \
+echo " * Open Source Social Network" >> /etc/apache2/ossn.config.site.php && \
+echo " *" >> /etc/apache2/ossn.config.site.php && \
+echo " * @package   (softlab24.com).ossn" >> /etc/apache2/ossn.config.site.php && \
+echo " * @author    OSSN Core Team <info@softlab24.com>" >> /etc/apache2/ossn.config.site.php && \
+echo " * @copyright (C) SOFTLAB24 LIMITED" >> /etc/apache2/ossn.config.site.php && \
+echo " * @license   Open Source Social Network License (OSSN LICENSE)  http://www.opensource-socialnetwork.org/licence" >> /etc/apache2/ossn.config.site.php && \
+echo " * @link      https://www.opensource-socialnetwork.org/" >> /etc/apache2/ossn.config.site.php && \
+echo " */" >> /etc/apache2/ossn.config.site.php && \
+echo "" >> /etc/apache2/ossn.config.site.php && \
+echo "$Ossn->url = '$servername';" >> /etc/apache2/ossn.config.site.php && \
+echo "$Ossn->userdata = '$DataDirectory';" >> /etc/apache2/ossn.config.site.php
 
 RUN \
-echo "<?php" > /etc/apache2/ossn.config.db && \
-echo "/**" >> /etc/apache2/ossn.config.db && \
-echo " * Open Source Social Network" >> /etc/apache2/ossn.config.db && \
-echo " *" >> /etc/apache2/ossn.config.db && \
-echo " * @package   (softlab24.com).ossn" >> /etc/apache2/ossn.config.db && \
-echo " * @author    OSSN Core Team <info@softlab24.com>" >> /etc/apache2/ossn.config.db && \
-echo " * @copyright (C) SOFTLAB24 LIMITED" >> /etc/apache2/ossn.config.db && \
-echo " * @license   Open Source Social Network License (OSSN LICENSE)  http://www.opensource-socialnetwork.org/licence" >> /etc/apache2/ossn.config.db && \
-echo " * @link      https://www.opensource-socialnetwork.org/" >> /etc/apache2/ossn.config.db && \
-echo " */" >> /etc/apache2/ossn.config.db && \
-echo "" >> /etc/apache2/ossn.config.db && \
-echo "// replace <<host>> with your database host name;" >> /etc/apache2/ossn.config.db && \
-echo "/$Ossn->host = '$DBHost';" >> /etc/apache2/ossn.config.db && \
-echo "" >> /etc/apache2/ossn.config.db && \
-echo "// replace <<port>> with your database host name;" >> /etc/apache2/ossn.config.db && \
-echo "/$Ossn->port = '$DBPort';" >> /etc/apache2/ossn.config.db && \
-echo "" >> /etc/apache2/ossn.config.db && \
-echo "// replace <<user>> with your database username;" >> /etc/apache2/ossn.config.db && \
-echo "/$Ossn->user = '$DBUser';" >> /etc/apache2/ossn.config.db && \
-echo "" >> /etc/apache2/ossn.config.db && \
-echo "// replace <<password>> with your database password;" >> /etc/apache2/ossn.config.db && \
-echo "/$Ossn->password = '$DBPassword';" >> /etc/apache2/ossn.config.db && \
-echo "" >> /etc/apache2/ossn.config.db && \
-echo "// replace <<dbname>> with your database name;" >> /etc/apache2/ossn.config.db && \
-echo "/$Ossn->database = '$DBName';" >> /etc/apache2/ossn.config.db
+echo "<?php" > /etc/apache2/ossn.config.db.php && \
+echo "/**" >> /etc/apache2/ossn.config.db.php && \
+echo " * Open Source Social Network" >> /etc/apache2/ossn.config.db.php && \
+echo " *" >> /etc/apache2/ossn.config.db.php && \
+echo " * @package   (softlab24.com).ossn" >> /etc/apache2/ossn.config.db.php && \
+echo " * @author    OSSN Core Team <info@softlab24.com>" >> /etc/apache2/ossn.config.db.php && \
+echo " * @copyright (C) SOFTLAB24 LIMITED" >> /etc/apache2/ossn.config.db.php && \
+echo " * @license   Open Source Social Network License (OSSN LICENSE)  http://www.opensource-socialnetwork.org/licence" >> /etc/apache2/ossn.config.db.php && \
+echo " * @link      https://www.opensource-socialnetwork.org/" >> /etc/apache2/ossn.config.db.php && \
+echo " */" >> /etc/apache2/ossn.config.db.php && \
+echo "" >> /etc/apache2/ossn.config.db.php && \
+echo "// replace <<host>> with your database host name;" >> /etc/apache2/ossn.config.db.php && \
+echo "/$Ossn->host = '$DBHost';" >> /etc/apache2/ossn.config.db.php && \
+echo "" >> /etc/apache2/ossn.config.db.php && \
+echo "// replace <<port>> with your database host name;" >> /etc/apache2/ossn.config.db.php && \
+echo "/$Ossn->port = '$DBPort';" >> /etc/apache2/ossn.config.db.php && \
+echo "" >> /etc/apache2/ossn.config.db.php && \
+echo "// replace <<user>> with your database username;" >> /etc/apache2/ossn.config.db.php && \
+echo "/$Ossn->user = '$DBUser';" >> /etc/apache2/ossn.config.db.php && \
+echo "" >> /etc/apache2/ossn.config.db.php && \
+echo "// replace <<password>> with your database password;" >> /etc/apache2/ossn.config.db.php && \
+echo "/$Ossn->password = '$DBPassword';" >> /etc/apache2/ossn.config.db.php && \
+echo "" >> /etc/apache2/ossn.config.db.php && \
+echo "// replace <<dbname>> with your database name;" >> /etc/apache2/ossn.config.db.php && \
+echo "/$Ossn->database = '$DBName';" >> /etc/apache2/ossn.config.db.php
 
 ADD apache2.conf /etc/apache2/apache2.conf
 ADD ports.conf /etc/apache2/ports.conf