diff --git a/src/startpage/Containerfile b/src/startpage/Containerfile index 31d2cd5..052a717 100644 --- a/src/startpage/Containerfile +++ b/src/startpage/Containerfile @@ -5,11 +5,13 @@ FROM localhost/debian # deploy options # -p (port) and -v (volume) both go host:container -LABEL config_default="-p 9082:80" +LABEL config_default="\ +-p 9082:80 \ +-v /srv/vol/startpage/data:/vol/data" # Build Variables -# versions of php and postgres -ARG phpv=7.3 +# uid that the files owner user should have +ARG FILESUID=5000 ### ### General Setup @@ -18,12 +20,20 @@ ARG phpv=7.3 # install packages we want RUN apt update -y && apt install -y apache2 libapache2-mod-php php-json +# autodetect php version and put it in /etc/environment +RUN echo "PHPV=$(echo $(php -r 'echo PHP_VERSION;') | cut -d '.' -f 1-2)" >> /etc/environment + +# change www-data's UID to the file owner UID +RUN usermod --uid $FILESUID www-data && \ + groupmod --gid $FILESUID www-data && \ + chown -R www-data:www-data /var/www + ### ### Apache ### # enable modules we need -RUN a2enmod php${phpv} +RUN a2enmod php${PHPV:?} # copy site config COPY assets/site.conf /etc/apache2/sites-available/ @@ -43,12 +53,13 @@ RUN wget https://github.com/saschadiercks/browserStartpage/archive/master.zip && chown -R www-data:www-data /var/www/html && \ rm -r browserStartpage-master -# copy config +# make symlinks WORKDIR /var/www/html -COPY --chown=www-data:www-data assets/config.php startpage/config/config.php -COPY --chown=www-data:www-data assets/data.json startpage/data/data.json - -# copy thumbnails -COPY --chown=www-data:www-data assets/thumbnails/ startpage/assets/thumbnails/ -# copy wallpaper -COPY --chown=www-data:www-data assets/wallpaper/ startpage/assets/wallpaper/ +RUN rm startpage/config/config.php && \ + ln -s /vol/data/config.php startpage/config/config.php && \ + rm startpage/data/data.json && \ + ln -s /vol/data/data.json startpage/data/data.json && \ + rm -r startpage/assets/thumbnails && \ + ln -s /vol/data/thumbnails startpage/assets/thumbnails && \ + rm -r startpage/assets/wallpaper && \ + ln -s /vol/data/wallpaper startpage/assets/wallpaper diff --git a/src/startpage/assets/data.json b/src/startpage/assets/data.json deleted file mode 100644 index f972c54..0000000 --- a/src/startpage/assets/data.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "linktarget" : "_self", - "wallpaper" : "assets/wallpaper/mountains.jpg", - "content": { - "General" : [ - { - "url": "https://medusa.alemor.org/nextcloud/", - "title": "Nextcloud", - "image": "assets/thumbnails/nextcloud.svg" - }, - { - "url": "https://medusa.alemor.org/git/", - "title": "Gitea", - "image": "assets/thumbnails/gitea.svg" - }, - { - "url": "https://www.duckduckgo.com/", - "title": "DuckDuckGo", - "image": "assets/thumbnails/duckduckgo.png" - }, - { - "url": "https://en.wikipedia.org/", - "title": "Wikipedia", - "image": "assets/thumbnails/wikipedia.svg" - }, - { - "url": "https://www.amazon.com/", - "title": "Amazon", - "image": "assets/thumbnails/amazon.svg" - }, - { - "url": "https://www.reddit.com/", - "title": "Reddit", - "image": "assets/thumbnails/reddit.svg" - }, - { - "url": "https://www.facebook.com/", - "title": "Facebook", - "image": "assets/thumbnails/facebook.svg" - }, - { - "url": "https://twitter.com/", - "title": "Twitter", - "image": "assets/thumbnails/twitter.svg" - }, - { - "url": "https://web.whatsapp.com/", - "title": "WhatsApp Web", - "image": "assets/thumbnails/whatsapp.svg" - }, - { - "url": "https://voice.google.com/u/0/messages", - "title": "Google Voice", - "image": "assets/thumbnails/google_voice.svg" - }, - { - "url": "https://hangouts.google.com/", - "title": "Google Hangouts", - "image": "assets/thumbnails/google_hangouts.svg" - }, - { - "url": "https://discord.com/app", - "title": "Discord", - "image": "assets/thumbnails/discord.svg" - } - ], - "Work" : [ - { - "url": "https://github.com/", - "title": "Github", - "image": "assets/thumbnails/github.svg" - }, - { - "url": "https://www.wolframalpha.com/", - "title": "Wolfram Alpha", - "image": "assets/thumbnails/wolfram_alpha.svg" - } - ], - "Media" : [ - { - "url" : "https://www.youtube.com/", - "title": "YouTube", - "image": "assets/thumbnails/youtube.svg" - }, - { - "url" : "https://www.netflix.com/", - "title": "Netflix", - "image": "assets/thumbnails/netflix.svg" - }, - { - "url" : "https://www.hulu.com/", - "title": "Hulu", - "image": "assets/thumbnails/hulu.svg" - }, - { - "url" : "https://www.amazon.com/Amazon-Video/b?ie=UTF8&node=2858778011", - "title": "Amazon Prime Video", - "image": "assets/thumbnails/amazon_prime_video.svg" - }, - { - "url" : "https://play.hbonow.com", - "title": "HBO Now", - "image": "assets/thumbnails/hbo_now.svg" - }, - { - "url" : "https://www.thewatchcartoononline.tv/", - "title": "WatchCartoonOnline", - "image": "assets/thumbnails/watch_cartoon_online.gif" - }, - { - "url" : "https://www.pandora.com/", - "title": "Pandora", - "image": "assets/thumbnails/pandora.svg" - }, - { - "url" : "https://libro.fm/", - "title": "Libro.fm", - "image": "assets/thumbnails/librofm.jpg" - } - ] - }, - "bookmarks" : { - "Downloads" : [ - { - "url": "https://www.humblebundle.com/", - "title": "Humble Bundle" - }, - { - "url": "https://www.gog.com/", - "title": "GOG.com" - }, - { - "url": "https://www.kerbalspaceprogram.com/profile.php?userProf=info", - "title": "KSP Store" - }, - { - "url": "https://www.steamworkshopdownloader.io/", - "title": "Steam Workshop Downloader" - }, - { - "url": "https://thetrove.net/", - "title": "The Trove" - }, - { - "url": "http://gen.lib.rus.ec/", - "title": "Library Genesis" - } - ], - "Forums" : [ - { - "url": "https://artemis.forumchitchat.com/", - "title": "Artemis" - }, - { - "url": "https://eclipsephase.com/forum", - "title": "Eclipse Phase" - }, - { - "url": "https://forum.kerbalspaceprogram.com/", - "title": "Kerbal Space Program" - }, - { - "url": "https://en-forum.guildwars2.com/", - "title": "Guild Wars 2" - } - ], - "Webcomics" : [ - { - "url": "https://xkcd.com/", - "title": "xkcd" - }, - { - "url": "https://www.smbc-comics.com/", - "title": "SMBC" - }, - { - "url": "https://questionablecontent.net/", - "title": "Questionable Content" - }, - { - "url": "https://existentialcomics.com/", - "title": "Existential Comics" - }, - { - "url": "https://www.giantitp.com/Comics.html", - "title": "The Order of the Stick" - }, - { - "url": "https://pbfcomics.com/", - "title": "Perry Bible Fellowship" - } - ], - "Alemor" : [ - { - "url": "https://login.linode.com/login", - "title": "Linode" - }, - { - "url": "https://account.dyn.com/", - "title": "Dyn DNS" - }, - { - "url": "https://portal.vitelity.net/login.php", - "title": "Vitelity" - } - ] - } -} diff --git a/src/startpage/assets/site.conf b/src/startpage/assets/site.conf deleted file mode 100644 index dc014fb..0000000 --- a/src/startpage/assets/site.conf +++ /dev/null @@ -1,9 +0,0 @@ - - DocumentRoot /var/www/html/startpage - - #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/src/startpage/assets/thumbnails/amazon.svg b/src/startpage/assets/thumbnails/amazon.svg deleted file mode 100644 index 08fbaf6..0000000 --- a/src/startpage/assets/thumbnails/amazon.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/amazon_prime_video.svg b/src/startpage/assets/thumbnails/amazon_prime_video.svg deleted file mode 100644 index 0f5630a..0000000 --- a/src/startpage/assets/thumbnails/amazon_prime_video.svg +++ /dev/null @@ -1,130 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/src/startpage/assets/thumbnails/discord.svg b/src/startpage/assets/thumbnails/discord.svg deleted file mode 100644 index 1522846..0000000 --- a/src/startpage/assets/thumbnails/discord.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/duckduckgo.png b/src/startpage/assets/thumbnails/duckduckgo.png deleted file mode 100644 index a12b7b8..0000000 Binary files a/src/startpage/assets/thumbnails/duckduckgo.png and /dev/null differ diff --git a/src/startpage/assets/thumbnails/facebook.svg b/src/startpage/assets/thumbnails/facebook.svg deleted file mode 100644 index c09997a..0000000 --- a/src/startpage/assets/thumbnails/facebook.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/startpage/assets/thumbnails/gitea.svg b/src/startpage/assets/thumbnails/gitea.svg deleted file mode 100644 index ac1594a..0000000 --- a/src/startpage/assets/thumbnails/gitea.svg +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/github.svg b/src/startpage/assets/thumbnails/github.svg deleted file mode 100644 index 977cf9d..0000000 --- a/src/startpage/assets/thumbnails/github.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/google_hangouts.svg b/src/startpage/assets/thumbnails/google_hangouts.svg deleted file mode 100644 index 394d4f7..0000000 --- a/src/startpage/assets/thumbnails/google_hangouts.svg +++ /dev/null @@ -1,1525 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/google_voice.svg b/src/startpage/assets/thumbnails/google_voice.svg deleted file mode 100644 index 99a0e96..0000000 --- a/src/startpage/assets/thumbnails/google_voice.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/hbo_now.svg b/src/startpage/assets/thumbnails/hbo_now.svg deleted file mode 100644 index 2c84d42..0000000 --- a/src/startpage/assets/thumbnails/hbo_now.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/hulu.svg b/src/startpage/assets/thumbnails/hulu.svg deleted file mode 100644 index a9845ce..0000000 --- a/src/startpage/assets/thumbnails/hulu.svg +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - Created by HiQPdf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/librofm.jpg b/src/startpage/assets/thumbnails/librofm.jpg deleted file mode 100644 index db50ec1..0000000 Binary files a/src/startpage/assets/thumbnails/librofm.jpg and /dev/null differ diff --git a/src/startpage/assets/thumbnails/netflix.svg b/src/startpage/assets/thumbnails/netflix.svg deleted file mode 100644 index b413dd5..0000000 --- a/src/startpage/assets/thumbnails/netflix.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/nextcloud.svg b/src/startpage/assets/thumbnails/nextcloud.svg deleted file mode 100644 index 82dfdc4..0000000 --- a/src/startpage/assets/thumbnails/nextcloud.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/startpage/assets/thumbnails/pandora.svg b/src/startpage/assets/thumbnails/pandora.svg deleted file mode 100644 index 7c25201..0000000 --- a/src/startpage/assets/thumbnails/pandora.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/reddit.svg b/src/startpage/assets/thumbnails/reddit.svg deleted file mode 100644 index 17aa0ef..0000000 --- a/src/startpage/assets/thumbnails/reddit.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/twitter.svg b/src/startpage/assets/thumbnails/twitter.svg deleted file mode 100644 index 90f7394..0000000 --- a/src/startpage/assets/thumbnails/twitter.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/watch_cartoon_online.gif b/src/startpage/assets/thumbnails/watch_cartoon_online.gif deleted file mode 100644 index 135d1ce..0000000 Binary files a/src/startpage/assets/thumbnails/watch_cartoon_online.gif and /dev/null differ diff --git a/src/startpage/assets/thumbnails/whatsapp.svg b/src/startpage/assets/thumbnails/whatsapp.svg deleted file mode 100644 index 00f3d03..0000000 --- a/src/startpage/assets/thumbnails/whatsapp.svg +++ /dev/null @@ -1,1901 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/wikipedia.svg b/src/startpage/assets/thumbnails/wikipedia.svg deleted file mode 100644 index dc32f98..0000000 --- a/src/startpage/assets/thumbnails/wikipedia.svg +++ /dev/null @@ -1 +0,0 @@ -]>Wikipedia logo version 2 \ No newline at end of file diff --git a/src/startpage/assets/thumbnails/wolfram_alpha.svg b/src/startpage/assets/thumbnails/wolfram_alpha.svg deleted file mode 100644 index 9485f6e..0000000 --- a/src/startpage/assets/thumbnails/wolfram_alpha.svg +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/thumbnails/youtube.svg b/src/startpage/assets/thumbnails/youtube.svg deleted file mode 100644 index 770d57f..0000000 --- a/src/startpage/assets/thumbnails/youtube.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/startpage/assets/wallpaper/mountains.jpg b/src/startpage/assets/wallpaper/mountains.jpg deleted file mode 100644 index 48c42b8..0000000 Binary files a/src/startpage/assets/wallpaper/mountains.jpg and /dev/null differ