- Fix HTTPD log.

- New version naming standard,
- Now use docker_tools for .env building,
- Now use rx3-docker/php-apache:1.4.0-mga9 & rx3-docker/mariadb-1.1.0-mga9 images,
- Add /var/log/init*, /var/log/supervisor* volumes,
- Fix crontab: user ampache user instead of root and add it to git,
- Fix database restart in compose file,
- Add database healthcheck & webapp service depencies.

.env

@@ -1,7 +0,0 @@
-# Rx3 Ampache Mageia-9 Docker Image
-#-------------------------------------------------------------------------------
-
-IMG_NAME="ampache-mga9"
-IMG_FULL_NAME="Rx3 Ampache Mageia-9 Docker Image"
-IMG_VERSION="1.0.0"
-IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'

Dockerfile

@@ -1,61 +1,63 @@
-#
+# Rx3-Docker/Ampache Dockerfile
 #-------------------------------------------------------------------------------
 
-FROM docker.xor.rx3:5000/rx3/php-apache-mga9:1.2.0
+ARG IMG_FROM_URL="rx3-docker/php-apache:latest"
+
+FROM ${IMG_FROM_URL}
 
 ARG IMG_NAME
-ARG IMG_FULL_NAME
+ARG IMG_NAME_FULL
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-ARG AMPACHE_VERSION=6.6.0
-
-ENV DISABLE_INOTIFYWAIT_CLEAN 0
-
-LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
 LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
 LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
+ARG AMPACHE_VERSION=6.6.0
 
-RUN urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec59 lib64event7 lib64mp3lame-devel lib64theora-devel lib64vorbis-devel lib64vpx-devel php-iconv php-curl php-gd php-intl php-ldap php-sabre-xml php-zip supervisor vorbis-tools zip unzip pwauth \
-    &&  mkdir -p /var/log/ampache \
-    &&  wget -q -O /tmp/ampache.zip https://github.com/ampache/ampache/releases/download/${AMPACHE_VERSION}/ampache-${AMPACHE_VERSION}_all_php8.2.zip \
-    &&  unzip /tmp/ampache.zip -d /var/www \
-    &&  sed -i -e 's/$transcode_cfg != '"'"'never'"'"'/$transcode_cfg != '"'"'ever'"'"'/' /var/www/src/Module/Util/Waveform.php \
-    &&  cp -f /var/www/public/rest/.htaccess.dist  /var/www/public/rest/.htaccess \
-    &&  cp -f /var/www/public/play/.htaccess.dist  /var/www/public/play/.htaccess \
-    &&  cp -f /var/www/config/ampache.cfg.php.dist /var/tmp \
-    &&  rm -f /tmp/ampache.zip /var/www/public/.php*cs* /var/www/public/.sc /var/www/public/.scrutinizer.yml /var/www/public/.tgitconfig /var/www/public/.travis.yml /var/www/public/*.md \
-    &&  find /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {} \
-    &&  chown -R root:root /var/www \
-    &&  chmod -R 775 /var/www \
-    &&  echo -e '#!/bin/bash\n\ncp -f /var/www/config/ampache.cfg.php.dist /var/www/config\nchown -R ${APACHE_UID}:${APACHE_GID} /var/www/config /var/log/ampache\n/usr/local/sbin/apache_init' > /usr/local/sbin/ampache_init \
-    &&  chmod a+x /usr/local/sbin/ampache_init
+ENV DISABLE_INOTIFYWAIT_CLEAN=0
+
+
+
+#---------------------------------------------------------------------------------------------------
+ARG AMPACHE='#!/bin/bash                                                                         \n\
+                                                                                                 \n\
+cp -f /var/tmp/ampache.cfg.php.dist /var/www/config                                              \n\
+                                                                                                 \n\
+chown -R apache:apache /var/www/config /var/log/ampache'
+#---------------------------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------------------------
+ARG AMPACHE_CRON='# /etc/cron.d/ampache: crontab fragment for ampache server                     \n\
+                                                                                                 \n\
+PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin                                                \n\
+                                                                                                 \n\
+15      3       *       *       *       apache    cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1'
+#---------------------------------------------------------------------------------------------------
+
+
+
+RUN urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec59 lib64event7 lib64mp3lame-devel lib64theora-devel lib64vorbis-devel lib64vpx-devel php-iconv php-curl php-gd php-intl php-ldap php-sabre-xml php-zip vorbis-tools zip unzip \
+    && mkdir -p /var/log/ampache                                                                                                                                                             \
+    && wget -q -O /tmp/ampache.zip https://github.com/ampache/ampache/releases/download/${AMPACHE_VERSION}/ampache-${AMPACHE_VERSION}_all_php8.2.zip                                         \
+    && unzip /tmp/ampache.zip -d /var/www                                                                                                                                                    \
+    && sed   -i -e 's/$transcode_cfg != '"'"'never'"'"'/$transcode_cfg != '"'"'ever'"'"'/' /var/www/src/Module/Util/Waveform.php                                                             \
+    && sed   -i -e 's/ || static::getUserRepository()->idByEmail($email) > 0//' /var/www/src/Repository/Model/User.php                                                                       \
+    && cp    -f /var/www/public/rest/.htaccess.dist  /var/www/public/rest/.htaccess                                                                                                          \
+    && cp    -f /var/www/public/play/.htaccess.dist  /var/www/public/play/.htaccess                                                                                                          \
+    && cp    -f /var/www/config/ampache.cfg.php.dist /var/tmp                                                                                                                                \
+    && rm    -f /tmp/ampache.zip /var/www/public/.php*cs* /var/www/public/.sc /var/www/public/.scrutinizer.yml /var/www/public/.tgitconfig /var/www/public/.travis.yml /var/www/public/*.md  \
+    && find     /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {}                                                                                                                  \
+    && chown -R root:root /var/www                                                                                                                                                           \
+    && chmod -R 775 /var/www                                                                                                                                                                 \
+    && echo  -e "${AMPACHE}"      | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/ampache                                                                                                     \
+    && chmod  a+x /etc/init.d/ampache                                                                                                                                                        \
+    && ln    -s   /etc/init.d/ampache /etc/rcD.d/S40ampache
 
 
 VOLUME ["/var/www/html/config"]
 VOLUME ["/var/log/ampache"]
 VOLUME ["/media"]
 
-
-EXPOSE 80
-
-ENTRYPOINT ["/usr/local/sbin/ampache_init"]
-
-
-
-#COPY data/bin/run.sh data/bin/inotifywait.sh data/bin/cron.sh data/bin/apache2.sh data/bin/mysql.sh data/bin/create_mysql_admin_user.sh data/bin/ampache_cron.sh data/bin/docker-entrypoint.sh /usr/local/bin/
-#COPY data/sites-enabled/001-ampache.conf /etc/apache2/sites-available/
-#COPY data/apache2/php.ini /etc/php/8.2/apache2/
-#COPY data/logrotate.d/* /etc/logrotate.d/
-#COPY data/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-#RUN  chown -R www-data:www-data /var/tmp/ampache.cfg.php.dist /var/www/config \
-#    &&  chmod +x /usr/local/bin/*.sh
-
-#ENTRYPOINT ["docker-entrypoint.sh"]
-#CMD ["run.sh"]
-
-#ENTRYPOINT ["/bin/bash -c sleep 60m"]
-

ReadMe.txt

@@ -1,11 +1,15 @@
-Welcome to ampache-mga9 docker image!
+Welcome to Rx3-Docker/Ampache docker image!
 
 
 
-This is project aims to build a Ampache + Mageia 9 docker image.
+This is project aims to build an Ampache docker image.
 
 Features:
-    - ...
+    - Using Ampache V 6.6.0,
+    - Based on rx3-docker/php-apache:1.4.0-mga9 & rx3-docker/mariadb:1.1.0 images,
+    - Support mysql & external pwauth authentication.
+
+
 
 Enjoy it!
 

ReleaseNotes.txt

@@ -1,5 +1,76 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-PHP-Apache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25
+Rx3-Docker/Ampache V 1.3.0 - A. GIBERT - 2024/12/02
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move & Rename repo from Rx3/Ampache-MGA9 to Rx3-Docker/Ampache,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Now use rx3-docker/php-apache:1.4.0-mga9 & rx3-docker/mariadb-1.1.0-mga9 images,
+- Add /var/log/init*, /var/log/supervisor* volumes,
+- Fix crontab: user ampache user instead of root and add it to git,
+- Fix database restart in compose file,
+- Add database healthcheck & webapp service depencies.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.2.2 - A. GIBERT - 2024/10/06
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Now use rx3/php-apache-mga9:1.3.3 image:
+  - PHP memory limit increased from 128M to 512M,
+  - mpm support,
+  - pwauth support,
+- Remove now unneeded pwauth install & PHP config.
+- Now use rx3/mariadb-mga9:1.0.2
+- Variabilization of external server ports in env & compose file,
+- Now use docker_tools for .env building,
+- local directory normalization,
+- fix ampache.cfg.php.dist initialization.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.2.1 - A. GIBERT - 2024/08/28
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/php-apache-mga9:1.3.2 image,
+- Switch to rx3/mariadb-mga9:1.0.1 image,
+- Fix /usr/bin/pwauth group & mode,
+- Fix Ampache Repository/Model/User.php: remove email lookup for new user.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.2.0 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/mariadb-mga9:1.0.0 image,
+- Now full Rx3 based!
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/php-apache-mga9:1.3.1 image,
+- Minor compose file update.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.1.0 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/php-apache-mga9:1.3.0 image,
+- Configure php.ini,
+- Update compose & Dockerfile.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,

compose.yaml

@@ -1,98 +1,137 @@
-# Rx3 Ampache Mageia-9 Docker Image
+# Rx3-Docker/Ampache Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_NAME}
+name:                               ${HOST_NAME_PREFIX}
 
 services:
   database:
-    container_name: ${IMG_NAME}-mysql
+    container_name:                 ${DB_HOST_NAME}
+    hostname:                       ${DB_HOST_NAME}
     
-    image: mariadb:11.4.3-ubi9
+    image:                          ${DB_IMG_URL}
+
+    restart:                        unless-stopped
     
     environment:
-      MARIADB_ROOT_PASSWORD: mysqladmin
-      MARIADB_DATABASE: ampache
-      MARIADB_USER: ampache
-      MARIADB_PASSWORD: ampacheadmin
-      MARIADB_ROOT_HOST: '%'  # needs to be enclosed with quotes
+      MARIADB_UID:                  ${DB_USER_ID}
+      MARIADB_GID:                  ${DB_GROUP_ID}
+      MARIADB_ROOT_HOST:            ${DB_ROOT_HOST}
+      MARIADB_ROOT_PASSWORD:        ${DB_ROOT_PASSWORD}
+      MARIADB_DATABASE:             ${DB_DB_NAME}
+      MARIADB_USER:                 ${DB_DB_USER}
+      MARIADB_PASSWORD:             ${DB_DB_PASSWORD}
 
-    user: "983:981"
+    healthcheck:
+      test:                         ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p${DB_ROOT_PASSWORD}' ]
+      interval:                     10s
+      timeout:                      3s
+      retries:                      3
       
     volumes:
-      - ./mysql:/var/lib/mysql
+      - ./${DB_LIB_EXT}:${DB_LIB_INT}
+      - ./${DB_LOG_INIT_EXT}:${DB_LOG_INIT_INT}
+      - ./${DB_LOG_SV_EXT}:${DB_LOG_SV_INT}
+      - ./${DB_LOG_MAIN_EXT}:${DB_LOG_MAIN_INT}
       
     networks:
-      - ampache
+      - appl
+      
+    ports:
+      - "127.0.0.1:${DB_PORT_SV_EXT}:${DB_PORT_SV_INT}"
+      - "127.0.0.1:${DB_PORT_MAIN_EXT}:${DB_PORT_MAIN_INT}"
       
   webapp-internal:
-    container_name: ${IMG_NAME}-internal
+    container_name:                 ${WAI_HOST_NAME}
+    hostname:                       ${WAI_HOST_NAME}
     
-    image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION}
+    image:                          ${WAI_IMG_URL}
 
     build:
-      context: .
+      context:                      .
       args:
-        - IMG_NAME=${IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
-        - IMG_VERSION=${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
+        IMG_NAME:                   ${WAI_IMG_URL}
+        IMG_NAME_FULL:              ${WAI_IMG_NAME_FULL}
+        IMG_VERSION:                ${WAI_IMG_VERSION}
+        IMG_MAINTAINER:             ${APPL_MAINTAINER}
+        IMG_FROM_URL:               ${WAI_IMG_FROM_URL}
         
-    restart: unless-stopped
+    restart:                        unless-stopped
+    
+    depends_on:
+      database:
+        condition:                  service_healthy
         
     environment:
-      - APACHE_UID=980
-      - APACHE_GID=977
-      - APACHE_DOC_ROOT=/var/www/public
-      - DISABLE_INOTIFYWAIT_CLEAN=1
+      APACHE_UID:                   ${WAI_USER_ID}
+      APACHE_GID:                   ${WAI_GROUP_ID}
+      APACHE_DOC_ROOT:              ${APACHE_DOC_ROOT}
 
     volumes:
-      - ./ampache-internal/config:/var/www/config
-      - ./ampache-internal/log:/var/log/ampache
+      - ./${WAI_LOG_INIT_EXT}:${WAI_LOG_INIT_INT}
+      - ./${WAI_LOG_SV_EXT}:${WAI_LOG_SV_INT}
+      - ./${WAI_LOG_HTTPD_EXT}:${WAI_LOG_HTTPD_INT}
+      - ./${WAI_LOG_MAIN_EXT}:${WAI_LOG_MAIN_INT}
+    
+      - ./etc/ampache-webapp-internal:/var/www/config
       - ./etc/cron.d/ampache:/etc/cron.d/ampache:ro
       - /etc/passwd:/etc/passwd:ro
       - /etc/group:/etc/group:ro
       - /etc/shadow:/etc/shadow:ro
-      - ./media/music:/media/music
-      - ./media/video:/media/video
+      
+      - ${MUSIC_REPO}:/media/music
+      - ${VIDEO_REPO}:/media/video
       
     networks:
-      - ampache
+      - appl
+      
     ports:
-      - "127.0.0.1:8085:80"
+      - "127.0.0.1:${WAI_PORT_SV_EXT}:${WAI_PORT_SV_INT}"
+      - "127.0.0.1:${WAI_PORT_MAIN_EXT}:${WAI_PORT_MAIN_INT}"
       
   webapp-external:
-    container_name: ${IMG_NAME}-external
+    container_name:                 ${WAE_HOST_NAME}
+    hostname:                       ${WAE_HOST_NAME}
     
-    image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION}
+    image:                          ${WAE_IMG_URL}
     
-    restart: unless-stopped
+    restart:                        unless-stopped
+    
+    depends_on:
+      database:
+        condition:                  service_healthy
         
     environment:
-      - APACHE_UID=980
-      - APACHE_GID=977
-      - APACHE_DOC_ROOT=/var/www/public
-      - DISABLE_INOTIFYWAIT_CLEAN=1
+      APACHE_UID:                   ${WAE_USER_ID}
+      APACHE_GID:                   ${WAE_GROUP_ID}
+      APACHE_DOC_ROOT:              ${APACHE_DOC_ROOT}
 
     volumes:
-      - ./ampache-external/config:/var/www/config
-      - ./ampache-external/log:/var/log/ampache
+      - ./${WAE_LOG_INIT_EXT}:${WAE_LOG_INIT_INT}
+      - ./${WAE_LOG_SV_EXT}:${WAE_LOG_SV_INT}
+      - ./${WAE_LOG_HTTPD_EXT}:${WAE_LOG_HTTPD_INT}
+      - ./${WAE_LOG_MAIN_EXT}:${WAE_LOG_MAIN_INT}
+      
+      - ./etc/ampache-webapp-external:/var/www/config
       - /etc/passwd:/etc/passwd:ro
       - /etc/group:/etc/group:ro
-      - ./media/music:/media/music
-      - ./media/video:/media/video
+      
+      - ${MUSIC_REPO}:/media/music
+      - ${VIDEO_REPO}:/media/video
 
     networks:
-      - ampache
+      - appl
+      
     ports:   
-      - "127.0.0.1:8086:80"
+      - "127.0.0.1:${WAE_PORT_SV_EXT}:${WAE_PORT_SV_INT}"
+      - "127.0.0.1:${WAE_PORT_MAIN_EXT}:${WAE_PORT_MAIN_INT}"
 
 networks:
-  ampache:
-    name: ampache
-    driver: bridge
+  appl:
+    name:                           ${NETWORK_NAME}
+    driver:                         bridge
     driver_opts:
-      com.docker.network.bridge.name: br-ampache
+      com.docker.network.bridge.name: ${NETWORK_IF_NAME}
     ipam:
       config:
-        - subnet: 10.2.33.0/24
-          gateway: 10.2.33.254
+        - subnet:                   10.2.33.0/24
+          gateway:                  10.2.33.254

env.dist

@@ -0,0 +1,107 @@
+# Rx3 Ampache Mageia-9 Docker Image
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+ORG_NAME="rx3-docker"
+ORG_REGISTRY="docker.xor.rx3:5000"
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+APPL_NAME="ampache"
+APPL_NAME_FULL="Ampache"
+APPL_NAME_SHORT="ampache"
+APPL_ORG="rx3-docker"
+APPL_VERSION="1.3.0"
+APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+
+
+#-------------------------------------------------------------------------------
+# User Settings
+#-------------------------------------------------------------------------------
+
+#APPL_ENV="prd"
+#APPL_ENV="tst"
+#APPL_ENV="int"
+APPL_ENV="dvp"
+
+MUSIC_REPO="./opt/music"
+VIDEO_REPO="./opt/video"
+
+
+
+#-------------------------------------------------------------------------------
+# Common
+#-------------------------------------------------------------------------------
+
+if [[  "${APPL_ENV}" != "prd" ]]
+then
+    APPL_SUFFIX="-${APPL_ENV}"
+    PORT_ENV_OFFSET=100
+else
+    APPL_SUFFIX=""
+    PORT_ENV_OFFSET=0
+fi
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
+APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}/${APPL_NAME_SHORT}"
+
+HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX}
+
+PORT_ENV_OFFSET=0
+
+PORT_SV_INT=9001
+PORT_SV_OFFSET=1000
+
+NETWORK_NAME=${HOST_NAME_PREFIX}
+NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
+
+DOCKER_TOOLS_DEBUG=FALSE
+DOCKER_TOOLS_VOLUME=MERGED
+#DOCKER_TOOLS_EXECPTION_LIBS="postgres:pgsql"
+
+
+
+#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
+#                  | Variable | Service                  | Target Image                                                                            | From Image                                      | Module                    | Main Port     | Admin Port    | User         | Group        |
+#                  | Prefix   | Name                     | URL Prefix         | Name             | Name Full                     | Version         | URL Prefix         | Name          | Version    | Name         | Version    | Ext   | Int   | Ext   | Int   | Name / Id    | Name / Id    |
+#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
+
+docker_service_add   DB         database                   ${ORG_URL_PREFIX}    mariadb            -                               1.1.0-mga9        -                    -               -            mysql          -            8006    3306    -       -       postgres       postgres
+
+docker_service_add   WAI        webapp-internal            ${ORG_URL_PREFIX}    ampache            "Rx3-Docker/Ampache"            1.3.0-mga9        ${ORG_URL_PREFIX}    php-apache      1.4.0-mga9   -              -            8085    80      -       -       apache         apache
+docker_service_add   WAE        webapp-external            ${ORG_URL_PREFIX}    ampache            -                               1.3.0-mga9        -                    -               -            -              -            8086    80      -       -       apache         apache
+
+
+
+#-------------------------------------------------------------------------------
+# Database
+#-------------------------------------------------------------------------------
+
+DB_ROOT_HOST='%'  # needs to be enclosed with quotes
+DB_ROOT_PASSWORD="mysqladmin"
+DB_DB_NAME="ampache"
+DB_DB_USER="ampache"
+DB_DB_PASSWORD="ampacheadmin"
+
+
+
+#-------------------------------------------------------------------------------
+# WebApp
+#-------------------------------------------------------------------------------
+
+APACHE_DOC_ROOT=/var/www/public
+
+WAI_LOG_HTTPD_INT="/var/log/httpd"
+WAI_LOG_HTTPD_EXT="./var/log/httpd-webapp-internal"
+WAE_LOG_HTTPD_INT="/var/log/httpd"
+WAE_LOG_HTTPD_EXT="./var/log/httpd-webapp-external"

etc/ampache-webapp-external/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

etc/ampache-webapp-internal/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

etc/cron.d/ampache

@@ -0,0 +1,5 @@
+# /etc/cron.d/ampache: crontab fragment for ampache server
+
+PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
+
+15      3       *       *       *       apache    cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1

opt/music/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

opt/video/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/lib/mysql-database/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/ampache-webapp-external/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/ampache-webapp-internal/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/httpd-webapp-external/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/httpd-webapp-internal/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/init-database/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/init-webapp-external/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/init-webapp-internal/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/mysql-database/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/supervisor-database/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/supervisor-webapp-external/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/supervisor-webapp-internal/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore