aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--apache.conf37
-rw-r--r--deploy.sh3
3 files changed, 1 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index ae5c512..dfedaed 100644
--- a/Makefile
+++ b/Makefile
@@ -2,5 +2,4 @@ deploy:
hugo
rsync -avz --delete public/ ubuntu@nextcloud.kagamino.dev:~/kagamino_blog/
rsync -avz deploy.sh ubuntu@nextcloud.kagamino.dev:~/deploy.sh
- rsync -avz apache.conf ubuntu@nextcloud.kagamino.dev:~/kagamino_blog.conf
- ssh ubuntu@nextcloud.kagamino.dev 'sudo bash deploy.sh' \ No newline at end of file
+ ssh ubuntu@nextcloud.kagamino.dev 'sudo bash deploy.sh'
diff --git a/apache.conf b/apache.conf
deleted file mode 100644
index f4dd049..0000000
--- a/apache.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
- DocumentRoot /var/www/kagamino_blog
- ServerName blog.kagamino.dev
-
- <IfModule mod_headers.c>
- Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains"
- </IfModule>
- <Directory /var/www/kagamino_blog>
- Require all granted
- AllowOverride All
- Options FollowSymLinks MultiViews
- </Directory>
-
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/blog.kagamino.dev/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/blog.kagamino.dev/privkey.pem
-</VirtualHost>
-</IfModule>
-<IfModule mod_ssl.c>
-<VirtualHost *:80>
- DocumentRoot /var/www/kagamino_blog
- ServerName blog.kagamino.dev
-
- <IfModule mod_headers.c>
- Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains"
- </IfModule>
- <Directory /var/www/kagamino_blog>
- Require all granted
- AllowOverride All
- Options FollowSymLinks MultiViews
- </Directory>
-RewriteEngine on
-RewriteCond %{SERVER_NAME} =blog.kagamino.dev
-RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
-</VirtualHost>
-</IfModule> \ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index fa24151..19430f2 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-sudo mv kagamino_blog.conf /etc/apache2/sites-available/
-sudo ln -fs /etc/apache2/sites-available/kagamino_blog.conf /etc/apache2/sites-enabled/
sudo rsync -avz --delete kagamino_blog/ /var/www/kagamino_blog/
sudo chown -R www-data:www-data /var/www/kagamino_blog
-sudo service apache2 restart \ No newline at end of file