diff --git a/blueprints/wordpress.tgz b/blueprints/wordpress.tgz deleted file mode 100644 index b0eb7859be05e9a743c2a2879ea4d3840d05f6b3..0000000000000000000000000000000000000000 Binary files a/blueprints/wordpress.tgz and /dev/null differ diff --git a/importers/mysql.sh b/importers/mysql.sh deleted file mode 100755 index 632bc10f8cb5590b4512c8d12ce905db1cedab56..0000000000000000000000000000000000000000 --- a/importers/mysql.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -if [ ! -d "/data/per-user/$USER/mysql/data" ]; then - mkdir -p /data/per-user/$USER/mysql/data - echo MYSQL_PASS=`echo $RANDOM ${date} | md5sum | base64 | cut -c-10` > /data/per-user/$USER/mysql/.env -fi diff --git a/importers/wordpress.sh b/importers/wordpress.sh deleted file mode 100755 index 7e1f05698acd5488aaf8be1f18c304dd0c551466..0000000000000000000000000000000000000000 --- a/importers/wordpress.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ ! -d "/data/per-user/$USER/wordpress/data" ]; then - cd /data/per-user/$USER/ - tar xvzf /data/indiehosters/blueprints/wordpress.tgz - cat /data/per-user/$USER/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > /data/per-user/$USER/wordpress/.env -fi diff --git a/scripts/setup.sh b/scripts/setup.sh index 3c680b9917aa9e33388eddaba65d67c9fc06c19e..b008dd6881fb9eb68b50867114c9465295834f8b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -11,8 +11,6 @@ systemctl daemon-reload # Pull relevant docker images docker pull indiehosters/haproxy-confd -docker pull indiehosters/mysql -docker pull indiehosters/wordpress docker pull indiehosters/nginx # Activate default domain diff --git a/unit-files/mysql-importer@.service b/unit-files/mysql-importer@.service deleted file mode 100644 index 77af011a0f0b8388a2d225ac4014f4a6db7bdfe7..0000000000000000000000000000000000000000 --- a/unit-files/mysql-importer@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=MySQL importer -Before=mysql@%i.service - -[Service] -Type=oneshot -RemainAfterExit=yes -Environment=USER=%i -ExecStart=/data/indiehosters/importers/mysql.sh - -[Install] -WantedBy=mysql@%i.service diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service deleted file mode 100644 index d96dd96e08861394e3c602df06865a0af79f9a31..0000000000000000000000000000000000000000 --- a/unit-files/mysql@.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=%p-%i -After=docker.service -After=%p-importer@%i.service -Requires=docker.service -Requires=%p-importer@%i.service - -[Service] -Restart=always -TimeoutStartSec=0 -ExecStartPre=-/usr/bin/docker kill %p-%i -ExecStartPre=-/usr/bin/docker rm %p-%i -ExecStart=/usr/bin/docker run\ ---name %p-%i\ --v /data/per-user/%i/%p/data:/var/lib/mysql\ ---env-file /data/per-user/%i/%p/.env\ -indiehosters/mysql -ExecReload=/usr/bin/docker restart %p-%i -ExecStop=/usr/bin/docker stop %p-%i - -[Install] -WantedBy=multi-user.target diff --git a/unit-files/wordpress-discovery@.service b/unit-files/wordpress-discovery@.service deleted file mode 100644 index 94b2cd219d254d96ee0f610de36e099b78951d23..0000000000000000000000000000000000000000 --- a/unit-files/wordpress-discovery@.service +++ /dev/null @@ -1,36 +0,0 @@ -[Unit] -Description=%p for %i etcd registration - -# Requirements -Requires=etcd.service -Requires=wordpress@%i.service - -# Dependency ordering and binding -After=etcd.service -After=wordpress@%i.service -BindsTo=wordpress@%i.service - -[Service] - -EnvironmentFile=/etc/environment -TimeoutStartSec=0 -# Start -## Test whether service is accessible and then register useful information -ExecStart=/bin/bash -c '\ - sleep 3; \ - while true; do \ - app=`echo %p | cut -d"-" -f1`; \ - ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' $app-%i`; \ - curl -f $ip; \ - if [ $? -eq 0 ]; then \ - etcdctl set /services/$app/%i \'{"ip":"\'$ip\'", "port":"80"}\' --ttl 30; \ - else \ - etcdctl rm /services/$app/%i; \ - fi; \ - sleep 20; \ - done' - -# Stop -ExecStop=/bin/bash -ceux '\ - app=`echo %p | cut -d"-" -f1`;\ - /usr/bin/etcdctl rm /services/$app/%i diff --git a/unit-files/wordpress-importer@.service b/unit-files/wordpress-importer@.service deleted file mode 100644 index 33f56658ef84e4e5137659ae429abcc5548bb05c..0000000000000000000000000000000000000000 --- a/unit-files/wordpress-importer@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=WordPress importer -After=mysql-importer@%i.service -Before=wordpress@%i.service - -[Service] -Type=oneshot -RemainAfterExit=yes -Environment=USER=%i -ExecStart=/data/indiehosters/importers/wordpress.sh - -[Install] -WantedBy=wordpress@%i.service diff --git a/unit-files/wordpress@.service b/unit-files/wordpress@.service deleted file mode 100644 index 96a540222c9442864553a95837133aad6688de40..0000000000000000000000000000000000000000 --- a/unit-files/wordpress@.service +++ /dev/null @@ -1,31 +0,0 @@ -[Unit] -Description=%p-%i -After=docker.service - -Requires=etcd.service -Requires=docker.service -Requires=mysql@%i.service -After=mysql@%i.service -Requires=%p-importer@%i.service -Requires=%p-discovery@%i.service - -After=%p-importer@%i.service -Before=%p-discovery@%i.service - -[Service] -Restart=always -TimeoutStartSec=0 -ExecStartPre=-/usr/bin/docker kill %p-%i -ExecStartPre=-/usr/bin/docker rm %p-%i -ExecStart=/usr/bin/docker run\ ---name %p-%i\ ---link mysql-%i:db\ --v /data/per-user/%i/%p/data/wp-content:/app/wp-content\ --v /data/per-user/%i/%p/data/.htaccess:/app/.htaccess\ ---env-file /data/per-user/%i/%p/.env\ -indiehosters/wordpress -ExecReload=/usr/bin/docker restart %p-%i -ExecStop=/usr/bin/docker stop %p-%i - -[Install] -WantedBy=multi-user.target