diff --git a/aria2/Dockerfile b/aria2/Dockerfile index b340874..9c3a429 100644 --- a/aria2/Dockerfile +++ b/aria2/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev ENV TOKEN 00000000-0000-0000-0000-000000000000 diff --git a/audiowaveform/Dockerfile b/audiowaveform/Dockerfile index e326c73..4419567 100644 --- a/audiowaveform/Dockerfile +++ b/audiowaveform/Dockerfile @@ -3,7 +3,7 @@ # FROM ubuntu -MAINTAINER kev +MAINTAINER kev RUN apt-get update \ && apt install -y cmake \ diff --git a/bro/Dockerfile b/bro/Dockerfile index e08ae96..249960a 100644 --- a/bro/Dockerfile +++ b/bro/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev RUN apt-get update \ && apt-get install -y curl \ diff --git a/btsync/Dockerfile b/btsync/Dockerfile index 6ccab32..84d5648 100644 --- a/btsync/Dockerfile +++ b/btsync/Dockerfile @@ -3,7 +3,7 @@ # FROM debian -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apt-get update \ diff --git a/cadvisor/Dockerfile b/cadvisor/Dockerfile index c295800..1124c05 100644 --- a/cadvisor/Dockerfile +++ b/cadvisor/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add --update ca-certificates device-mapper \ diff --git a/casperjs/Dockerfile b/casperjs/Dockerfile index 7d11106..ec2dfc3 100644 --- a/casperjs/Dockerfile +++ b/casperjs/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV PHANTOM_VER 2.1.1 ENV PHANTOM_URL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-${PHANTOM_VER}-linux-x86_64.tar.bz2 diff --git a/chinadns/Dockerfile b/chinadns/Dockerfile index e7fe7ed..f3467d2 100644 --- a/chinadns/Dockerfile +++ b/chinadns/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV DNS_VER 1.3.2 ENV DNS_URL https://github.com/clowwindy/ChinaDNS/releases/download/${DNS_VER}/chinadns-${DNS_VER}.tar.gz diff --git a/clamav/Dockerfile b/clamav/Dockerfile index 6d428d6..507c35a 100644 --- a/clamav/Dockerfile +++ b/clamav/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U clamav clamav-libunrar \ diff --git a/collectd/Dockerfile b/collectd/Dockerfile index a0dae29..422e337 100644 --- a/collectd/Dockerfile +++ b/collectd/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U collectd collectd-dev \ && rm -rf /var/cache/apk/* diff --git a/cowrie/Dockerfile b/cowrie/Dockerfile index da6f7fe..ec14799 100644 --- a/cowrie/Dockerfile +++ b/cowrie/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U build-base \ libffi \ diff --git a/dante/Dockerfile b/dante/Dockerfile index d4c2d94..2c8040c 100644 --- a/dante/Dockerfile +++ b/dante/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV DANTE_VER 1.4.1 diff --git a/delegated/Dockerfile b/delegated/Dockerfile index 9cbeeb1..4ab7683 100644 --- a/delegated/Dockerfile +++ b/delegated/Dockerfile @@ -3,7 +3,7 @@ # FROM debian -MAINTAINER kev +MAINTAINER kev ENV DG_VERSION 9_9_13 ENV DG_FILE linux2.6-dg${DG_VERSION}.tar.gz diff --git a/discuz/Dockerfile b/discuz/Dockerfile index 730003d..6ad0686 100644 --- a/discuz/Dockerfile +++ b/discuz/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apt-get update \ diff --git a/discuz/README.md b/discuz/README.md index 433f7f1..40290f3 100644 --- a/discuz/README.md +++ b/discuz/README.md @@ -41,7 +41,7 @@ mysql: ``` server { listen 80; - server_name discuz.datageek.info; + server_name discuz.easypi.info; location / { proxy_pass http://127.0.0.1:8000; proxy_set_header Host $host; diff --git a/dnscrypt/README.md b/dnscrypt/README.md index 3b0b291..8a5cc99 100644 --- a/dnscrypt/README.md +++ b/dnscrypt/README.md @@ -16,7 +16,7 @@ dnscrypt environment: - LISTEN_ADDR=0.0.0.0:443 - RESOLVER_ADDR=8.8.8.8:53 - - PROVIDER_NAME=2.dnscrypt-cert.datageek.info + - PROVIDER_NAME=2.dnscrypt-cert.easypi.info restart: always proxy: @@ -27,7 +27,7 @@ dnscrypt environment: - LISTEN_ADDR=0.0.0.0:443 - RESOLVER_ADDR=1.2.3.4:443 - - PROVIDER_NAME=2.dnscrypt-cert.datageek.info + - PROVIDER_NAME=2.dnscrypt-cert.easypi.info - PROVIDER_KEY=4C29:9CEB:CF8D:4612:48A8:B2F2:3B6F:A046:EBF5:2F2B:6433:27C6:5F3A:88F5:495E:3075 restart: always diff --git a/dnscrypt/proxy/Dockerfile b/dnscrypt/proxy/Dockerfile index 62ccb86..34e392c 100644 --- a/dnscrypt/proxy/Dockerfile +++ b/dnscrypt/proxy/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV LIBSODIUM_VERSION 1.0.10 ENV DNSCRYPT_VERSION 1.6.1 diff --git a/dnscrypt/proxy/dnscrypt-proxy/DEBIAN/control b/dnscrypt/proxy/dnscrypt-proxy/DEBIAN/control index 7b74772..9fb997c 100644 --- a/dnscrypt/proxy/dnscrypt-proxy/DEBIAN/control +++ b/dnscrypt/proxy/dnscrypt-proxy/DEBIAN/control @@ -1,6 +1,6 @@ Package: dnscrypt-proxy Version: 1.6.1-1 -Maintainer: noreply@datageek.info +Maintainer: noreply@easypi.info Depends: Homepage: https://dnscrypt.org/ Architecture: armhf diff --git a/dnscrypt/wrapper/Dockerfile b/dnscrypt/wrapper/Dockerfile index 8efa93c..4b92d09 100644 --- a/dnscrypt/wrapper/Dockerfile +++ b/dnscrypt/wrapper/Dockerfile @@ -3,13 +3,13 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV LIBSODIUM_VERSION 1.0.10 ENV DNSCRYPT_VERSION 0.2 ENV RESOLVER_ADDR 8.8.8.8:53 ENV LISTEN_ADDR 0.0.0.0:443 -ENV PROVIDER_NAME 2.dnscrypt-cert.datageek.info +ENV PROVIDER_NAME 2.dnscrypt-cert.easypi.info RUN set -xe \ && apt-get update \ diff --git a/dnsmasq/Dockerfile b/dnsmasq/Dockerfile index 7230399..2f701bd 100644 --- a/dnsmasq/Dockerfile +++ b/dnsmasq/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U dnsmasq \ diff --git a/dokuwiki/Dockerfile b/dokuwiki/Dockerfile index 7596bc5..451f4d7 100644 --- a/dokuwiki/Dockerfile +++ b/dokuwiki/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev WORKDIR /var/www/html diff --git a/dokuwiki/Dockerfile.debian b/dokuwiki/Dockerfile.debian index ad2ac16..033154b 100644 --- a/dokuwiki/Dockerfile.debian +++ b/dokuwiki/Dockerfile.debian @@ -7,7 +7,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev WORKDIR /var/www/html diff --git a/drone/README.md b/drone/README.md index edf7a27..0141512 100644 --- a/drone/README.md +++ b/drone/README.md @@ -10,9 +10,9 @@ drone # Github » Settings » Applications » Developer applications » Register new application # Application name: drone -Homepage URL: http://drone.datageek.info/ +Homepage URL: http://drone.easypi.info/ Application description: Drone is a Continuous Integration platform built on Docker, written in Go -Authorization callback URL: http://drone.datageek.info/authorize +Authorization callback URL: http://drone.easypi.info/authorize Client ID: ... (generated by github) Client Secret: ... (generated by github) ``` @@ -43,7 +43,7 @@ REMOTE_CONFIG=https://github.com?client_id=...&client_secret=... ``` server { listen 80; - server_name drone.datageek.info; + server_name drone.easypi.info; location / { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; @@ -70,9 +70,9 @@ $ docker-compose up -d $ docker-compose logs # client -$ firefox http://drone.datageek.info/settings/profile +$ firefox http://drone.easypi.info/settings/profile $ curl http://downloads.drone.io/drone-cli/drone_darwin_amd64.tar.gz | tar zx -C /usr/local/bin/ -$ export DRONE_SERVER=http://drone.datageek.info/ +$ export DRONE_SERVER=http://drone.easypi.info/ $ export DRONE_TOKEN=... $ drone help ``` diff --git a/ferm/Dockerfile b/ferm/Dockerfile index 2b1a88e..8a9389b 100644 --- a/ferm/Dockerfile +++ b/ferm/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U ferm && rm -rf /var/cache/apk/* diff --git a/ffserver/Dockerfile b/ffserver/Dockerfile index 9bba358..8b0cf1c 100644 --- a/ffserver/Dockerfile +++ b/ffserver/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U ffmpeg diff --git a/fteproxy/Dockerfile b/fteproxy/Dockerfile index f63a504..37e9339 100644 --- a/fteproxy/Dockerfile +++ b/fteproxy/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U build-base \ diff --git a/fteproxy/Dockerfile.debian b/fteproxy/Dockerfile.debian index e29d3a4..99019d1 100644 --- a/fteproxy/Dockerfile.debian +++ b/fteproxy/Dockerfile.debian @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV FTE_VER 0.2.18 ENV FTE_SYS linux diff --git a/ghost/README.md b/ghost/README.md index 04be87c..226f3a3 100644 --- a/ghost/README.md +++ b/ghost/README.md @@ -17,7 +17,7 @@ ghost: $ docker-compose up -d $ docker exec -it ghost_ghost_1 bash >>> cd /var/lib/ghost/ ->>> sed -i 's/localhost:2368/blog.datageek.info/' config.js +>>> sed -i 's/localhost:2368/blog.easypi.info/' config.js >>> sed -i '/google/d' themes/casper/default.hbs >>> exit $ docker-compose restart diff --git a/grafana/Dockerfile b/grafana/Dockerfile index a0f8c15..6a3777b 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV GRAFANA_VERSION=2.6.0 ENV GRAFANA_FILE=grafana_${GRAFANA_VERSION}_amd64.deb diff --git a/h2o/Dockerfile b/h2o/Dockerfile index d2cca09..16e31b3 100644 --- a/h2o/Dockerfile +++ b/h2o/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev ENV H2O_VER 1.7.1 ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz diff --git a/h2o/arm/Dockerfile b/h2o/arm/Dockerfile index d113047..b46fd43 100644 --- a/h2o/arm/Dockerfile +++ b/h2o/arm/Dockerfile @@ -3,7 +3,7 @@ # FROM vimagick/alpine-arm -MAINTAINER kev +MAINTAINER kev ENV H2O_VER 1.7.1 ENV H2O_URL https://github.com/h2o/h2o/archive/v${H2O_VER}.tar.gz diff --git a/httpbin/Dockerfile b/httpbin/Dockerfile index 1960084..30526a9 100644 --- a/httpbin/Dockerfile +++ b/httpbin/Dockerfile @@ -3,7 +3,7 @@ # FROM vimagick/python:3 -MAINTAINER kev +MAINTAINER kev RUN pip install gunicorn httpbin diff --git a/hubot/Dockerfile b/hubot/Dockerfile index 4e2c5bb..b9aab92 100644 --- a/hubot/Dockerfile +++ b/hubot/Dockerfile @@ -3,7 +3,7 @@ # FROM node:slim -MAINTAINER kev +MAINTAINER kev ENV HUBOT_NAME=hubot ENV HUBOT_ADAPTER=slack diff --git a/hugo/README.md b/hugo/README.md index c3f522b..bf95a01 100644 --- a/hugo/README.md +++ b/hugo/README.md @@ -23,7 +23,7 @@ hugo: command: > server --bind=0.0.0.0 --port=80 - --baseUrl=http://blog.datageek.info/ + --baseUrl=http://blog.easypi.info/ --theme=hyde --watch ports: @@ -59,6 +59,6 @@ $ hugo > The last `hugo` command will use `baseurl` in `config.toml`. -Open in your browser! +Open in your browser! [1]: http://gohugo.io/ diff --git a/hugo/arm/README.md b/hugo/arm/README.md index 5558a4e..fd11024 100644 --- a/hugo/arm/README.md +++ b/hugo/arm/README.md @@ -23,7 +23,7 @@ hugo: command: > server --bind=0.0.0.0 --port=80 - --baseUrl=http://blog.datageek.info/ + --baseUrl=http://blog.easypi.info/ --theme=hyde --watch ports: @@ -58,6 +58,6 @@ $ hugo > The last `hugo` command will use `baseurl` in `config.toml`. -Open in your browser! +Open in your browser! [1]: http://gohugo.io/ diff --git a/hugo/arm/docker-compose.yml b/hugo/arm/docker-compose.yml index 6c144cb..301d495 100644 --- a/hugo/arm/docker-compose.yml +++ b/hugo/arm/docker-compose.yml @@ -3,7 +3,7 @@ hugo: command: > server --bind=0.0.0.0 --port=80 - --baseUrl=http://blog.datageek.info/ + --baseUrl=http://blog.easypi.info/ --watch ports: - "80:80" diff --git a/hugo/docker-compose.yml b/hugo/docker-compose.yml index 6c144cb..301d495 100644 --- a/hugo/docker-compose.yml +++ b/hugo/docker-compose.yml @@ -3,7 +3,7 @@ hugo: command: > server --bind=0.0.0.0 --port=80 - --baseUrl=http://blog.datageek.info/ + --baseUrl=http://blog.easypi.info/ --watch ports: - "80:80" diff --git a/hydra/Dockerfile b/hydra/Dockerfile index e8aca34..30859de 100644 --- a/hydra/Dockerfile +++ b/hydra/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U apr-dev \ apr-util-dev \ diff --git a/hydra/README.md b/hydra/README.md index 212f1b6..1db7d4c 100644 --- a/hydra/README.md +++ b/hydra/README.md @@ -32,9 +32,9 @@ $ docker run --rm -it -v `pwd`:/work vimagick/hydra >>> hydra -l admin -P passwd.txt -o hacked.txt http://www.target.com/login.php [DATA] max 1 task per 1 server, overall 64 tasks, 3 login try (l:1/p:1), ~0 tries per task [DATA] attacking service http-get on port 2812 - [2812][http-get] host: ss.datageek.info login: admin password: admin + [2812][http-get] host: ss.easypi.info login: admin password: admin 1 of 1 target successfully completed, 1 valid password found >>> cat hacked.txt - [2812][http-get] host: ss.datageek.info login: admin password: admin + [2812][http-get] host: ss.easypi.info login: admin password: admin ``` diff --git a/influxdb/Dockerfile b/influxdb/Dockerfile index 4cfb63c..e59ede0 100644 --- a/influxdb/Dockerfile +++ b/influxdb/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV INFLUXDB_VERSION=0.12.0 ENV INFLUXDB_FILE=influxdb_${INFLUXDB_VERSION}-1_amd64.deb diff --git a/iptables/Dockerfile b/iptables/Dockerfile index 6478bed..0e3ef51 100644 --- a/iptables/Dockerfile +++ b/iptables/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U iproute2 diff --git a/jamapi/Dockerfile b/jamapi/Dockerfile index a33b9f8..1914be7 100644 --- a/jamapi/Dockerfile +++ b/jamapi/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev WORKDIR /app diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 360c61e..24abfc8 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev ENV JENKINS_HOME /var/jenkins_home diff --git a/jenkins/arm/Dockerfile b/jenkins/arm/Dockerfile index 279c278..1404e03 100644 --- a/jenkins/arm/Dockerfile +++ b/jenkins/arm/Dockerfile @@ -3,7 +3,7 @@ # FROM vimagick/alpine-arm -MAINTAINER kev +MAINTAINER kev ENV JENKINS_HOME /var/jenkins_home diff --git a/joomla/Dockerfile b/joomla/Dockerfile index ecbab29..837d4c4 100644 --- a/joomla/Dockerfile +++ b/joomla/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN apt-get update && apt-get install -y curl unzip bzip2 libpq-dev libpng12-dev libjpeg-dev \ && rm -rf /var/lib/apt/lists/* \ diff --git a/l2tpd/Dockerfile b/l2tpd/Dockerfile index 2def8a7..fcee89e 100644 --- a/l2tpd/Dockerfile +++ b/l2tpd/Dockerfile @@ -7,7 +7,7 @@ # FROM alpine:edge -MAINTAINER kev +MAINTAINER kev RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \ && apk add -U libreswan xl2tpd ppp \ diff --git a/letsencrypt/README.md b/letsencrypt/README.md index 94a87bf..7a1a655 100644 --- a/letsencrypt/README.md +++ b/letsencrypt/README.md @@ -26,13 +26,13 @@ $ systemctl stop nginx # generate keys $ docker-compose run --rm --service-ports letsencrypt ->>> email: admin@datageek.info ->>> domains: datageek.info,bbs.datageek.info,blog.datageek.info,wiki.datageek.info +>>> email: admin@easypi.info +>>> domains: easypi.info,bbs.easypi.info,blog.easypi.info,wiki.easypi.info # copy keys $ mkdir -p /etc/nginx/ssl/ -$ cp ./etc/letsencrypt/live/datageek.info/fullchain.pem /etc/nginx/ssl/datageek.info.crt -$ cp ./etc/letsencrypt/live/datageek.info/privkey.pem /etc/nginx/ssl/datageek.info.key +$ cp ./etc/letsencrypt/live/easypi.info/fullchain.pem /etc/nginx/ssl/easypi.info.crt +$ cp ./etc/letsencrypt/live/easypi.info/privkey.pem /etc/nginx/ssl/easypi.info.key # reconfig nginx $ vi /etc/nginx/sites-enabled/default @@ -44,9 +44,9 @@ server { server { listen 443 ssl; - server_name datageek.info blog.datageek.info; - ssl_certificate ssl/datageek.info.crt; - ssl_certificate_key ssl/datageek.info.key; + server_name easypi.info blog.easypi.info; + ssl_certificate ssl/easypi.info.crt; + ssl_certificate_key ssl/easypi.info.key; location / { proxy_pass http://127.0.0.1:8000; } diff --git a/magento/Dockerfile b/magento/Dockerfile index 2928ce0..51fcccd 100644 --- a/magento/Dockerfile +++ b/magento/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN a2enmod rewrite diff --git a/mantisbt/Dockerfile b/mantisbt/Dockerfile index 2e96549..8789b48 100644 --- a/mantisbt/Dockerfile +++ b/mantisbt/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN a2enmod rewrite diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 4c7e46e..54d469d 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U bash \ diff --git a/monit/Dockerfile b/monit/Dockerfile index 1014a0b..b472056 100644 --- a/monit/Dockerfile +++ b/monit/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U monit \ && rm -rf /var/cache/apk/* diff --git a/monit/monit/conf.d/system.cfg b/monit/monit/conf.d/system.cfg index 2733eda..96a5c8f 100644 --- a/monit/monit/conf.d/system.cfg +++ b/monit/monit/conf.d/system.cfg @@ -1,4 +1,4 @@ -check system ss.datageek.info +check system ss.easypi.info if loadavg (1min) > 4 then alert if loadavg (5min) > 2 then alert if memory usage > 80% then alert diff --git a/moodle/Dockerfile b/moodle/Dockerfile index 64692d9..e047190 100644 --- a/moodle/Dockerfile +++ b/moodle/Dockerfile @@ -5,7 +5,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN a2enmod rewrite diff --git a/mosquitto/Dockerfile b/mosquitto/Dockerfile index a15c16a..155c158 100644 --- a/mosquitto/Dockerfile +++ b/mosquitto/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -x \ && apk add -U mosquitto \ diff --git a/nginad/Dockerfile b/nginad/Dockerfile index d26061b..2f673cd 100644 --- a/nginad/Dockerfile +++ b/nginad/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev WORKDIR /var/www/html diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 1960c80..af7c700 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U nginx \ diff --git a/nginx/README.md b/nginx/README.md index f12d228..1b2db6b 100644 --- a/nginx/README.md +++ b/nginx/README.md @@ -88,7 +88,7 @@ server { server { listen 80; - server_name blog.foobar.site blog.datageek.info; + server_name blog.foobar.site blog.easypi.info; location / { proxy_pass http://127.0.0.1:6109; } @@ -96,7 +96,7 @@ server { server { listen 80; - server_name wiki.foobar.site wiki.datageek.info; + server_name wiki.foobar.site wiki.easypi.info; location / { auth_basic restricted; auth_basic_user_file /etc/nginx/htpasswd; @@ -106,7 +106,7 @@ server { server { listen 80; - server_name iot.foobar.site iot.datageek.info; + server_name iot.foobar.site iot.easypi.info; location / { proxy_pass http://127.0.0.1:1880; proxy_http_version 1.1; diff --git a/ngrokd/Dockerfile b/ngrokd/Dockerfile index f8e91b3..ef19349 100644 --- a/ngrokd/Dockerfile +++ b/ngrokd/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV NGROK_GIT https://github.com/inconshreveable/ngrok.git ENV NGROK_BASE_DOMAIN ngrok.foobar.site diff --git a/node-red/Dockerfile b/node-red/Dockerfile index fe926dd..952fd97 100644 --- a/node-red/Dockerfile +++ b/node-red/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U bash \ diff --git a/node-red/arm/Dockerfile b/node-red/arm/Dockerfile index e7c949e..47310ef 100644 --- a/node-red/arm/Dockerfile +++ b/node-red/arm/Dockerfile @@ -3,7 +3,7 @@ # FROM vimagick/alpine-arm -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U bash \ diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile index 28ca4a6..b13e412 100644 --- a/nodebb/Dockerfile +++ b/nodebb/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev ENV BB_VER 1.0.3 ENV BB_URL https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz diff --git a/nodebb/Dockerfile.debian b/nodebb/Dockerfile.debian index ee8dd3d..70b9b7d 100644 --- a/nodebb/Dockerfile.debian +++ b/nodebb/Dockerfile.debian @@ -3,7 +3,7 @@ # FROM debian -MAINTAINER kev +MAINTAINER kev ENV BB_VER 1.0.3 ENV BB_URL https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz diff --git a/nullmailer/Dockerfile b/nullmailer/Dockerfile index 83721f7..70b9495 100644 --- a/nullmailer/Dockerfile +++ b/nullmailer/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev ENV NM_VER 2.0 ENV NM_URL https://github.com/bruceg/nullmailer/archive/$NM_VER.tar.gz diff --git a/nullmailer/Dockerfile.debian b/nullmailer/Dockerfile.debian index ae12812..1a316af 100644 --- a/nullmailer/Dockerfile.debian +++ b/nullmailer/Dockerfile.debian @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev ENV DEBIAN_FRONTEND=noninteractive diff --git a/obfsproxy/Dockerfile b/obfsproxy/Dockerfile index d1c0ed3..363333d 100644 --- a/obfsproxy/Dockerfile +++ b/obfsproxy/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apt-get update \ diff --git a/obfsproxy/README.md b/obfsproxy/README.md index a20c617..714d85b 100644 --- a/obfsproxy/README.md +++ b/obfsproxy/README.md @@ -75,7 +75,7 @@ obfsproxy: - "1194:1194/tcp" environment: - PASSWORD=J23TNHPJPAOQJLTCPLFD4CQYVFY6MEVP - - DEST_ADDR=vpn.datageek.info + - DEST_ADDR=vpn.easypi.info - DEST_PORT=4911 - RUN_MODE=client - LISTEN_ADDR=0.0.0.0 diff --git a/obfsproxy/docker-compose.yml b/obfsproxy/docker-compose.yml index 067ff9b..eb97c70 100644 --- a/obfsproxy/docker-compose.yml +++ b/obfsproxy/docker-compose.yml @@ -18,7 +18,7 @@ client: - "1194:1194/tcp" environment: - PASSWORD=J23TNHPJPAOQJLTCPLFD4CQYVFY6MEVP - - DEST_ADDR=vpn.datageek.info + - DEST_ADDR=vpn.easypi.info - DEST_PORT=4911 - RUN_MODE=client - LISTEN_ADDR=0.0.0.0 diff --git a/opencart/Dockerfile b/opencart/Dockerfile index 3cf6d13..5b192e9 100644 --- a/opencart/Dockerfile +++ b/opencart/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN a2enmod rewrite diff --git a/openvpn/README.md b/openvpn/README.md index 3fbc5ce..71dc94f 100644 --- a/openvpn/README.md +++ b/openvpn/README.md @@ -5,8 +5,8 @@ openvpn OpenVPN is blocked in China. You need to connect vpn via secure tunnel. -- server: vpn.datageek.info -- bridge: bridge.datageek.info +- server: vpn.easypi.info +- bridge: bridge.easypi.info - client: localhost ## docker-compose.yml (server) @@ -52,7 +52,7 @@ fteproxy: - "1194:1194" environment: - "MODE=client" - - "SERVER_IP=vpn.datageek.info" + - "SERVER_IP=vpn.easypi.info" - "SERVER_PORT=4911" - "CLIENT_IP=0.0.0.0" - "CLIENT_PORT=1194" @@ -87,7 +87,7 @@ $ fig up -d ``` $ cat /etc/openvpn/client.conf ... -remote bridge.datageek.info 1194 tcp +remote bridge.easypi.info 1194 tcp route 192.168.1.0 255.255.255.0 net_gateway ... $ systemctl start openvpn@client diff --git a/openvpn/docker-compose.yml b/openvpn/docker-compose.yml index b5a9a4d..6b8c57e 100644 --- a/openvpn/docker-compose.yml +++ b/openvpn/docker-compose.yml @@ -38,7 +38,7 @@ fteproxy: # - "1194:1194" # environment: # - "MODE=client" -# - "SERVER_IP=vpn.datageek.info" +# - "SERVER_IP=vpn.easypi.info" # - "SERVER_PORT=4911" # - "CLIENT_IP=0.0.0.0" # - "CLIENT_PORT=1194" diff --git a/openvpn/setup.sh b/openvpn/setup.sh index a962799..4f27790 100755 --- a/openvpn/setup.sh +++ b/openvpn/setup.sh @@ -7,7 +7,7 @@ OVPN_DIR=./ovpn OVPN_IMG=vimagick/openvpn OVPN_DATA=openvpn_data_1 OVPN_BACKUP=openvpn.tgz -OVPN_SERVER=tcp://vpn.datageek.info +OVPN_SERVER=tcp://vpn.easypi.info mkdir -p $OVPN_DIR diff --git a/pdnsd/Dockerfile b/pdnsd/Dockerfile index ac093f6..a25bbf8 100644 --- a/pdnsd/Dockerfile +++ b/pdnsd/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U pdnsd \ && rm -rf /var/cache/apk/* diff --git a/phantomjs/Dockerfile b/phantomjs/Dockerfile index 78f6905..a30a444 100644 --- a/phantomjs/Dockerfile +++ b/phantomjs/Dockerfile @@ -3,7 +3,7 @@ # FROM ubuntu:14.04 -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apt-get update \ diff --git a/phpbb/Dockerfile b/phpbb/Dockerfile index fe82ff0..9cf0ee2 100644 --- a/phpbb/Dockerfile +++ b/phpbb/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN apt-get update && apt-get install -y curl unzip bzip2 libpq-dev libpng12-dev libjpeg-dev \ && rm -rf /var/lib/apt/lists/* \ diff --git a/piwik/Dockerfile b/piwik/Dockerfile index 4d226c7..27ba5d8 100644 --- a/piwik/Dockerfile +++ b/piwik/Dockerfile @@ -3,7 +3,7 @@ # FROM php:5.6-apache -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apt-get update \ diff --git a/polipo/Dockerfile b/polipo/Dockerfile index 8dd5dbb..f21e400 100644 --- a/polipo/Dockerfile +++ b/polipo/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U build-base openssl \ && wget https://github.com/jech/polipo/archive/master.zip -O polipo.zip \ diff --git a/pptpd/Dockerfile b/pptpd/Dockerfile index 6b6fea1..4394f25 100644 --- a/pptpd/Dockerfile +++ b/pptpd/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U iptables \ diff --git a/pptpd/Dockerfile.debian b/pptpd/Dockerfile.debian index 3ec6dc6..2f8e4cf 100644 --- a/pptpd/Dockerfile.debian +++ b/pptpd/Dockerfile.debian @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev RUN apt-get update \ && apt-get install -y iptables pptpd \ diff --git a/privoxy/Dockerfile b/privoxy/Dockerfile index 8607983..5861bdd 100644 --- a/privoxy/Dockerfile +++ b/privoxy/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev ADD https://github.com/tianon/gosu/releases/download/1.4/gosu-amd64 /usr/sbin/gosu diff --git a/privoxy/README.md b/privoxy/README.md index 870d0f7..7dcb3eb 100644 --- a/privoxy/README.md +++ b/privoxy/README.md @@ -44,7 +44,7 @@ file: user.action {+block} 127.0.0.1 104.156.239.190 -.datageek.info +.easypi.info ``` diff --git a/privoxy/privoxy/user.action b/privoxy/privoxy/user.action index 36cc58e..49d90ef 100644 --- a/privoxy/privoxy/user.action +++ b/privoxy/privoxy/user.action @@ -4,5 +4,5 @@ {+block} 127.0.0.1 104.156.239.190 -.datageek.info +.easypi.info diff --git a/proxyhub/Dockerfile b/proxyhub/Dockerfile index 9d0988f..a8c42c1 100644 --- a/proxyhub/Dockerfile +++ b/proxyhub/Dockerfile @@ -3,7 +3,7 @@ # FROM ubuntu:14.04 -MAINTAINER kev +MAINTAINER kev RUN apt-get update RUN apt-get install -y build-essential pdnsd haproxy polipo nginx python diff --git a/proxyhub/sstest b/proxyhub/sstest index e88a697..4624753 100755 --- a/proxyhub/sstest +++ b/proxyhub/sstest @@ -4,9 +4,9 @@ # sstest - shadowsocks tester # # # Long Form -# sstest ss://aes-256-cfb:secret@datageek.info:8388 +# sstest ss://aes-256-cfb:secret@easypi.info:8388 # # Short Form -# sstest password@datageek.info +# sstest password@easypi.info # # Hash Form # sstest c3M6Ly9hZXMtMjU2LWNmYjpzZWNyZXRAZGF0YWdlZWsuaW5mbzo4Mzg4 # # File Form diff --git a/pure-ftpd/Dockerfile b/pure-ftpd/Dockerfile index 1ae1801..a64ba35 100644 --- a/pure-ftpd/Dockerfile +++ b/pure-ftpd/Dockerfile @@ -3,7 +3,7 @@ # FROM debian:jessie -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apt-get update \ diff --git a/python/python2/Dockerfile b/python/python2/Dockerfile index 5509482..8f5cc0a 100644 --- a/python/python2/Dockerfile +++ b/python/python2/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U curl python \ && curl -sSL https://bootstrap.pypa.io/get-pip.py | python \ diff --git a/python/python3/Dockerfile b/python/python3/Dockerfile index 30136b7..1a11f6e 100644 --- a/python/python3/Dockerfile +++ b/python/python3/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U curl python3 \ && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 \ diff --git a/redis-arm/Dockerfile b/redis-arm/Dockerfile index 02214d6..27ba4bd 100644 --- a/redis-arm/Dockerfile +++ b/redis-arm/Dockerfile @@ -3,7 +3,7 @@ # FROM vimagick/alpine-arm -MAINTAINER kev +MAINTAINER kev RUN set -ex \ && apk add -U redis \ diff --git a/registrator/docker-compose.yml b/registrator/docker-compose.yml index ef5e009..e67e5c4 100644 --- a/registrator/docker-compose.yml +++ b/registrator/docker-compose.yml @@ -1,7 +1,7 @@ registrator: image: gliderlabs/registrator command: etcd://127.0.0.1:2379/services - hostname: datageek.info + hostname: easypi.info volumes: - /var/run/docker.sock:/tmp/docker.sock net: host diff --git a/revive/Dockerfile b/revive/Dockerfile index f22ed14..f0154f1 100644 --- a/revive/Dockerfile +++ b/revive/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev WORKDIR /var/www/html diff --git a/rsyncd/Dockerfile b/rsyncd/Dockerfile index dbeb245..e437485 100644 --- a/rsyncd/Dockerfile +++ b/rsyncd/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine -MAINTAINER kev +MAINTAINER kev RUN apk add -U rsync \ && rm -rf /var/cache/apk/* diff --git a/rtmp/README.md b/rtmp/README.md index c5c5e17..d17e281 100644 --- a/rtmp/README.md +++ b/rtmp/README.md @@ -38,11 +38,11 @@ server: client: image: vimagick/rtmp-client-arm -# command: ffmpeg -i /dev/video0 -vf "hflip,vflip" -f flv rtmp://cctv.datageek.info/live/webcam +# command: ffmpeg -i /dev/video0 -vf "hflip,vflip" -f flv rtmp://cctv.easypi.info/live/webcam devices: - /dev/video0:/dev/video0 environment: - - RTMP_URI=rtmp://datageek.info/live/webcam + - RTMP_URI=rtmp://easypi.info/live/webcam restart: always ``` @@ -60,26 +60,26 @@ $ youtube-dl 'https://www.youtube.com/watch?v=lJZlz-WnXzU' -o data/video.mp4 ``` # play remote video (remote -> local) -$ vlc rtmp://datageek.info/vod/video.mp4 +$ vlc rtmp://easypi.info/vod/video.mp4 # play local video (local -> remote -> local) -$ ffmpeg -re -i video.mp4 -f flv rtmp://datageek.info/live/video -$ vlc rtmp://datageek.info/live/video.mp4 +$ ffmpeg -re -i video.mp4 -f flv rtmp://easypi.info/live/video +$ vlc rtmp://easypi.info/live/video.mp4 # capture desktop (local -> remote) -$ ffmpeg -f avfoundation -pixel_format bgr0 -i 1:0 -f flv rtmp://datageek.info/live/webcam +$ ffmpeg -f avfoundation -pixel_format bgr0 -i 1:0 -f flv rtmp://easypi.info/live/webcam # record webcam (local -> remote) -$ ffmpeg -f qtkit -i 0 -f flv rtmp://datageek.info/live/webcam +$ ffmpeg -f qtkit -i 0 -f flv rtmp://easypi.info/live/webcam # record pi camera (pi -> remote) -$ ffmpeg -f video4linux2 -r 24 -i /dev/video0 -f flv rtmp://datageek.info/live/webcam +$ ffmpeg -f video4linux2 -r 24 -i /dev/video0 -f flv rtmp://easypi.info/live/webcam # record pi camera (pi -> remote) -$ /opt/vc/bin/raspivid -o - -t 0 -hf -w 640 -h 360 -fps 25 | ffmpeg -i - -f flv rtmp://datageek.info/live/webcam +$ /opt/vc/bin/raspivid -o - -t 0 -hf -w 640 -h 360 -fps 25 | ffmpeg -i - -f flv rtmp://easypi.info/live/webcam # watch webcam (remote -> local) -$ vlc rtmp://datageek.info/live/webcam +$ vlc rtmp://easypi.info/live/webcam ``` Optinally, you can run a docker container as RTMP client on raspberry pi. diff --git a/rtmp/client/Dockerfile b/rtmp/client/Dockerfile index c5d9d11..8d02956 100644 --- a/rtmp/client/Dockerfile +++ b/rtmp/client/Dockerfile @@ -3,7 +3,7 @@ # FROM vimagick/alpine-arm -MAINTAINER kev +MAINTAINER kev RUN set -xe \ && apk add -U ffmpeg \ diff --git a/rtmp/client/docker-compose.yml b/rtmp/client/docker-compose.yml index 8c55ec9..e511a0e 100644 --- a/rtmp/client/docker-compose.yml +++ b/rtmp/client/docker-compose.yml @@ -4,6 +4,6 @@ client: - /dev/video0:/dev/video0 environment: # - RTMP_DEV=rtsp://192.168.42.1/live - - RTMP_URI=rtmp://cctv.datageek.info/live/webcam + - RTMP_URI=rtmp://cctv.easypi.info/live/webcam # net: host restart: always diff --git a/rtmp/server/html/index.html b/rtmp/server/html/index.html index 82e0256..9c49dbd 100644 --- a/rtmp/server/html/index.html +++ b/rtmp/server/html/index.html @@ -20,7 +20,7 @@