diff --git a/.gitignore b/.gitignore index 4befed3..2dd6a8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store .idea +src \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d8704cb..968bd9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,5 +88,9 @@ RUN tar zxvfC /tmp/$PACKAGE.tar.gz /tmp/ \ && rm /tmp/$PACKAGE.tar.gz \ && mv /tmp/$PACKAGE /usr/local/share/groupoffice +#Create studio subdirectory, make writable +RUN mkdir -p /usr/local/share/groupoffice/go/modules/studio \ + && chown -R www-data:www-data /usr/local/share/groupoffice/go/modules/studio + CMD ["apache2-foreground"] ENTRYPOINT ["docker-go-entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 421115e..6d12a8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,11 @@ services: volumes: - "godata:/var/lib/groupoffice:cached" - "goetc:/etc/groupoffice:cached" +# - "gostudio:/usr/local/share/groupoffice/go/modules/studio:cached" + - ./src/studio:/usr/local/share/groupoffice/go/modules/studio -# Example for ssl + + # Example for ssl # - "./config/ssl/groupoffice:/etc/ssl/groupoffice" env_file: @@ -28,4 +31,5 @@ services: volumes: godata: goetc: + #gostudio: dbdata: diff --git a/etc/groupoffice/config.php.tpl b/etc/groupoffice/config.php.tpl index 5c5420d..d793cba 100644 --- a/etc/groupoffice/config.php.tpl +++ b/etc/groupoffice/config.php.tpl @@ -6,4 +6,10 @@ $config['db_pass'] = "{dbPass}"; $config['db_port'] = 3306; $config['file_storage_path'] = "/var/lib/groupoffice"; $config['tmpdir'] = "/tmp/groupoffice"; -$config['debug'] = false; \ No newline at end of file +$config['debug'] = false; +$config['business'] => array ( + 'studio' => + array ( + 'package' => 'studio', + ) + ); \ No newline at end of file diff --git a/src/.gitkeep b/src/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/studio/.gitkeep b/src/studio/.gitkeep new file mode 100644 index 0000000..e69de29