aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/.fonctions7
-rw-r--r--scripts/install4
-rw-r--r--scripts/restore1
3 files changed, 9 insertions, 3 deletions
diff --git a/scripts/.fonctions b/scripts/.fonctions
index 064a0c9..20f9ea0 100644
--- a/scripts/.fonctions
+++ b/scripts/.fonctions
@@ -110,6 +110,13 @@ SETUP_SOURCE () { # Download source, decompress and copu into $final_path
fi
}
+# Create user with special hack
+CREATE_USER () {
+ sudo curl -kSs https://${domain}/auth/sign_up --cookie-jar cookie | grep csrf > token || true
+ token=$(sudo cat token | sed -n '/csrf-token/s/.*name="csrf-token"\s\+content="\([^"]\+\).*/\1/p')
+ sudo curl -kSs https://${domain}/auth --data "&user[account_attributes][username]=${admin_mastodon}&user[email]=${admin_mastodon}@${domain}&user[password]=${admin_pass}&user[password_confirmation]=${admin_pass}&authenticity_token=${token}" --cookie cookie
+}
+
### REMOVE SCRIPT
REMOVE_NGINX_CONF () { # Delete nginx configuration
diff --git a/scripts/install b/scripts/install
index 3357c1d..2fd4b23 100644
--- a/scripts/install
+++ b/scripts/install
@@ -165,7 +165,7 @@ type rbenv
BCOMMANDS
# Add Services
-pushd $(popd)
+popd
sudo cp ../conf/mastodon-web.service /etc/systemd/system/mastodon-web.service
sudo chown root: /etc/systemd/system/mastodon-web.service
@@ -206,8 +206,6 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
# Install crontab
sudo cp ../conf/crontab_mastodon /etc/cron.d/$app
sudo sed -i "s@__APP__@$app@g" /etc/cron.d/$app
-# Restart crontab
-sudo systemctl restart cron
# Unprotected url
ynh_app_setting_set "$app" unprotected_uris "/"
diff --git a/scripts/restore b/scripts/restore
index f9861ff..3a2eeaf 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -104,6 +104,7 @@ sudo cp -a ./sources/. "$final_path"
# Set permissions
sudo chown -R $app: "$final_path"
+# Debug
sudo ls -alh "$final_path"
# Set UTF8 encoding by default